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

Conflicts:
	index.html
Site updated at 2014-11-21 21:49:32 UTC