A bit more professional :P
Merge branch 'master' of github.com:FriendsOfCake/blog