editando o texto
Merge branch 'master' of github.com:aliceandrade/sitesimples

Conflicts:
	blog.php