Octopress init
Site updated at 2014-02-04 09:07:32 UTC
Site updated at 2014-02-04 09:08:48 UTC
Merge branch 'master' of github.com:scottalan/scottalan.github.io

Conflicts:
	atom.xml
Site updated at 2014-02-04 09:10:36 UTC