Merge branch 'master' into 'inital-content'

# Conflicts:
#   src/_includes/section-three.html

src/_includes/section-one.html

@@ -4,8 +4,8 @@
     <header class="major">
       <h2>Autonomic is a co-operative<br />
       that is owned and run by its workers</h2>
-      <p>We are committed to a set of core values to build progressive technologies<br /> and 
-infrastructure that empower users to make a positive impact on the world</p>
+      <p>We build technologies and infrastructure to empower users to make a positive</br>
+      impact on the world. All of our services reflect our commitment to our core values:</p>
     </header>
     <ul class="icons major icons--flex">
       <li>

src/_includes/section-two.html

@@ -1,6 +1,6 @@
 <section id="two" class="wrapper alt style2">
 
-  {% for post in site.posts limit:site.tiles-count %}{% if site.tiles-source == 'posts' %}
+  {% for post in site.categories.values %}
 
   <section class="spotlight">
     <div class="image">{% if post.image %}<img src="{% if site.featured-image-source %}{{ post.image | prepend: site.featured-image-source | absolute_url }}{% else %}{{ "" | absolute_url }}/assets/images/{{ post.image }}{% endif %}" alt="" />{% endif %}</div>
@@ -9,18 +9,6 @@
       <p>{{ post.description }}</p>
     </div>
   </section>
-
-  {% endif %}{% endfor %}
-  {% for page in site.pages limit:site.tiles-count %}{% if site.tiles-source == 'pages' %}{% if page.layout == 'default' %}{% continue %}{% endif %}
-
-  <section class="spotlight">
-    <div class="image">{% if page.image %}<img src="{% if site.featured-image-source %}{{ page.image | prepend: site.featured-image-source | absolute_url }}{% else %}{{ "" | absolute_url }}/assets/images/{{ page.image }}{% endif %}" alt="" />{% endif %}</div>
-    <div class="content">
-      <h2><a href="{{ page.url | relative_url }}" class="link">{{ page.title }}</a></h2>
-      <p>{{ page.description }}</p>
-    </div>
-  </section>
-
-  {% endif %}{% endfor %}
+  {% endfor %}
 
 </section>