Octopress init
Merge branch 'master' of https://github.com/jclariviere/jclariviere.github.io

Conflicts:
	index.html
Use text=auto instead of eol=lf
Site updated at 2014-07-19 21:17:14 UTC