Octopress init
Merge branch 'master' of github.com:elffriend/elffriend.github.com