Merge remote-tracking branch 'origin/gh-pages' into gh-pages

showcase/index.html

@@ -46,7 +46,7 @@
             border: 1px solid #dddddd;
             border-radius:5px;
             width:880px;
-            max-height:350px;
+            max-height:400px;
             margin:30px;
         }
 
@@ -238,6 +238,25 @@
         </div>
     </div>
 
+    <div class="row">
+        <div class="col-md-12 col-lg-6">
+            <a href="http://www.beergraph.xyz">
+                <img src="./images/beergraph.png" class="showcase img-responsive">
+            </a>
+            <div class="description">
+                <div class="descriptionHeader">
+                    <a href="http://www.beergraph.xyz/"> Beergraph</a>
+                </div>
+                <div class="descriptionContent">
+                    An application that shows the different styles of beers. Each beer style
+                    with its own specifications, beers brands and beer family which it belongs
+                    to.
+                    Feel free to contribute your knowledge and build a better graph using the
+                    forms.
+                </div>
+            </div>
+        </div>
+    </div>
 
 </div>
 </div>