Octopress init
Site updated at 2013-12-19 15:49:57 UTC
Merge branch 'master' of github.com:stephen-marc/stephen-marc.github.io

Conflicts:
	index.html