Octopress init
Site updated at 2014-07-27 14:36:18 UTC
Merge branch 'master' of https://github.com/martinscosta/martinscosta.github.io

Conflicts:
	index.html