Octopress init
Site updated at 2014-11-20 12:29:25 UTC
Merge branch 'master' into gh-pages

Conflicts:
	index.html