Octopress init
Site updated at 2014-01-23 19:01:39 UTC
Site updated at 2014-01-23 19:04:16 UTC
Merge branch 'master' of https://github.com/cfenoy/cfenoy.github.io

Conflicts:
	about/index.html
	atom.xml
	sitemap.xml
	stylesheets/screen.css
Site updated at 2014-01-23 19:07:23 UTC