Merge branch 'develop'

Author: chrisvogt

LICENSE

@@ -0,0 +1,21 @@
+The MIT License
+
+Copyright (c) 2013-2015 FriendsOfCake http://friendsofcake.com
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

readme.md

@@ -1,6 +1,6 @@
 #friendsofcake.com
 
-[![Build Status](https://travis-ci.org/chrisvogt/FriendsOfCake.github.io.svg?branch=gh-pages)](https://travis-ci.org/chrisvogt/FriendsOfCake.github.io) [![Code Climate](https://codeclimate.com/github/chrisvogt/FriendsOfCake.github.io/badges/gpa.svg)](https://codeclimate.com/github/chrisvogt/FriendsOfCake.github.io)
+[![Build Status](https://travis-ci.org/chrisvogt/FriendsOfCake.github.io.svg?branch=gh-pages)](https://travis-ci.org/chrisvogt/FriendsOfCake.github.io) [![Code Climate](https://codeclimate.com/github/chrisvogt/FriendsOfCake.github.io/badges/gpa.svg)](https://codeclimate.com/github/chrisvogt/FriendsOfCake.github.io) [![GitHub license](https://img.shields.io/github/license/chrisvogt/FriendsOfCake.github.io.svg?style=flat-square)]()
 
 This repository holds the [friendsofcake.com](http://friendsofcake.com) website code, currently powered by [GitHub Pages](https://pages.github.com/) and [Jekyll](http://jekyllrb.com/).
 
@@ -26,3 +26,5 @@ The workflow for contributing to this project is as follows:
 ### Screenshot
 
 ![friendsofcake.com screenshot](http://i.imgur.com/7r6JKzP.gif)
+
+<img src="https://cdn.rawgit.com/jekyll/brand/master/jekyll-logo-light-transparent.png" alt="Made with Jekyll" width="140" align="right" /> <img src="http://bower.io/img/bower-logo.svg" alt="Made with Bower" height="70" align="right" />