Octopress init
Site updated at 2014-07-01 17:33:50 UTC
Updates to config
Merge remote-tracking branch 'origin/master' into source

Conflicts:
	index.html