..
Merge branch 'master' of https://github.com/lucasmauro/exercicios

Conflicts:
	PHP/Blog/index.php
	PHP/Blog/style.css