Merge branch 'master' of git-ungleich:dynamicweb

.gitignore

@@ -15,7 +15,6 @@ media/*
 !media/keep
 
 CACHE/
-static/
 
 \#*#
 .\#*
@@ -27,5 +26,4 @@ node_modules/
 ungleich.db
 *~*
 
-static/
 secret-key

digitalglarus/templates/digitalglarus/about.html

@@ -3,7 +3,7 @@
 {% block title %}About{% endblock %}
 
 {% block content %}
-	<div class="row">
+<div class="row">
   <div class="box">
     <div class="col-lg-12">
       <hr>
@@ -16,14 +16,27 @@
       <img class="img-responsive img-border-left" src="{% static 'digitalglarus/img/img_4.png' %}" alt="">
     </div>
     <div class="col-md-6">
-		    <p>We, the ungleich GmbH, were founded 2013 in Switzerland - however our first incarnation in Germany dates back to 2000.
+      <p>
-		     We  have long knowledge in tech industry, and have extensive networks with small to medium tech companies in Switzerland, because we are one of them. We have been working at coworking spaces with these small to medium sized IT companies ; tech-savvy and flexible, tech companies have open culture in work environment, and very often experience difficulty in letting their employees be as creative as possible. We understand and share their needs and problems. This is how we came up with a solution of our own, of finding and providing an attractive working space for technology companies in Switzerland. </p>
+	We, the ungleich GmbH, were founded 2013 in Switzerland -
+	however our first incarnation in Germany dates back to 2000.
+	We  have long knowledge in tech industry, and have extensive
+	networks with small to medium tech companies in Switzerland,
+	because we are one of them. We have been working at coworking
+	spaces with these small to medium sized IT companies ;
+	tech-savvy and flexible, tech companies have open culture in
+	work environment, and very often experience difficulty in
+	letting their employees be as creative as possible. We
+	understand and share their needs and problems. This is how we
+	came up with a solution of our own, of finding and providing
+	an attractive working space for technology companies
+	in Switzerland.
+      </p>
     </div>
     <div class="clearfix"></div>
   </div>
-	</div>
+</div>
 
-	<div class="row">
+<div class="row">
   <div class="box">
     <div class="col-lg-12">
       <hr>
@@ -39,7 +52,7 @@
       </h3>
     </div>
     <div class="col-sm-4 text-center">
-		  <img class="img-responsive" src="{% static 'digitalglarus/img/img_2.jpg' %}" alt="">
+      <img class="img-responsive" src="{% static 'digitalglarus/img/price_1.jpg' %}" alt="">
       <h3>AFFORDABLE
 	<small>price</small></h3>
     </div>
@@ -51,9 +64,9 @@
     </div>
     <div class="clearfix"></div>
   </div>
-	</div>
+</div>
 
-    </div>
+</div>
-    <!-- /.container -->
+<!-- /.container -->
 
 {% endblock %}