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

Conflicts:
	index.html
Site updated at 2014-03-25 19:15:15 UTC