Octopress init
Site updated at 2013-09-18 16:41:33 UTC
Site updated at 2013-09-18 16:44:32 UTC
Merge branch 'master' of github.com:diogot/diogot.github.io

Conflicts:
	atom.xml
	blog/archives/index.html
	index.html
	sitemap.xml
	stylesheets/screen.css
Site updated at 2013-09-18 16:52:13 UTC