Octopress init
Site updated at 2013-10-07 22:42:24 UTC
Site updated at 2013-10-07 22:44:18 UTC
Merge branch 'master' of github.com:aviolette/aviolette.github.io

Conflicts:
	atom.xml
	blog/archives/index.html
	index.html
	sitemap.xml
	stylesheets/screen.css