what: combine philosophy into about

_includes/header.html

@@ -25,7 +25,6 @@
           <ul class="dropdown-menu">
             <li><a href="{{site.baseurl}}/about/">About us</a></li>
             <li><a href="{{site.baseurl}}/history/">History</a></li>
-            <li><a href="{{site.baseurl}}/philosophy/">Philosophy</a></li>
           </ul>
         </li>
         <li class="dropdown">

_layouts/page.html

@@ -6,7 +6,7 @@
         <div class="section-white font-size-md mt100">
             <article class="post">
                 <header class="post-header">
-                    <h2 class="post-title text-uppercase">{{ page.title }}</h2>
+                    <h2 class="post-title">{{ page.title }}</h2>
                     <div class="underline"></div>
                 </header>
 

_sass/_styles.scss

@@ -131,15 +131,20 @@ body{
         font-size: 42px;
         color: #4E4E4E;
         letter-spacing: 4.5px;
-        line-height: 80px;
-	text-transform: uppercase;
+        text-transform: uppercase;
     }
     h3{
         font-family: 'Francois One', sans-serif;
         font-weight: 700;
         color: #4E4E4E;
-	text-transform: uppercase;
-	margin-top: 2ex;
+        text-transform: uppercase;
+        margin-top: 2ex;
+    }
+    h4{
+        font-family: 'Francois One', sans-serif;
+        font-weight: 700;
+        color: #4E4E4E;
+        margin-top: 2ex;
     }
     p{
         font-family: 'Lato', sans-serif;
@@ -153,6 +158,12 @@ body{
         text-decoration: underline;
 
     }
+    dl{
+        font-family: 'Lato', sans-serif;
+        color: #4E4E4E;
+        letter-spacing: 1.65px;
+        margin-top: 20px;
+    }
     ul{
         font-family: 'Lato', sans-serif;
         color: #4E4E4E;

about.md

@@ -5,14 +5,45 @@ permalink: /about/
 ---
 
 hillhacks is held in the lap of the stunning Dhauladhar Himalayas every summer.
+
 People from different places, walks of life and lines of thought come together
-to share, collaborate and learn. Hackers talk code. Artists share their
-creativity. Students join in from schools and colleges to learn new skills.
-Locals and globals mix and mingle.<br>We build things like tables, hula hoops,
-interactive art installations, and solar lanterns. We connect. We dance and
-sing. Ideas emerge. Collaborations form. Lives change.<br>In the hacking, we get
-hacked ourselves.
+to share, collaborate and learn.
+
+Hackers talk code.  Artists share their creativity.  Students join in from
+schools and colleges to learn new skills.  Locals and globals mix and mingle.
+We build things like tables, hula hoops, interactive art installations, and
+solar lanterns.  We connect.  We dance and sing.  Ideas emerge.  Collaborations
+form.  Lives change.
+
+In the hacking, we get hacked ourselves.
+
+### Philosophy
+
+hillhacks is passionate about making, sharing, learning, and the broad concepts
+of open source. Freedom, security, and environmentalism are also key to
+hillhackers. All of our ideas have conjoined into something exceptionally
+creative.
+
+We are just a bunch of people that got connected by crazy and various
+circumstances, in a spontaneous and still very dynamic way. Many hillhackers
+change direction in life thanks to interactions during hillhacks - starting
+school, quitting jobs, moving house, launching projects.
+
+hillhacks is inclusive. Being Excellent to Each Other is a core component of
+hillhacks. Everyone is welcome, regardless of economic background, race,
+religion, caste, nationality, political view, gender, and age.
+
+#### The four pillars of hillhacks
+
+{: .dl-horizontal}
+Education
+: Teaching expands horizons of students and the general public.
+
+Exchange
+: Sharing expert-to-expert broadens our connections and ideas.
 
-Read more about our [history]({{ site.baseurl }}{% link history.html %}) and our
-[philosophy]({{ site.baseurl }}{% link philosophy.md %}).
+Making
+: Gaining independence and freedom on so many levels.
 
+Caring
+: Shaping and developing our world, society, ethics and politics.