Octopress init
Site updated at 2014-09-21 17:50:27 UTC
Site updated at 2014-09-21 18:12:16 UTC
Site updated at 2014-09-21 18:15:09 UTC
Site updated at 2014-09-21 18:25:21 UTC
Merge branch 'master' of https://github.com/waisy/waisy.github.io

Conflicts:
	atom.xml
	blog/archives/index.html
	index.html
	sitemap.xml