deletando de novo
Merge branch 'master' of https://github.com/yaso/yaso.github.com

Conflicts:
	atom.xml
	blog/archives/index.html
	index.html
	js/application.js
	robots.txt