Octopress init
Site updated at 2014-03-13 17:51:53 UTC
Merge http://github.com/Carmol/carmol.github.io

Conflicts:
	index.html