fazendo commit
Merge branch 'master' of https://github.com/fabiobca/repositorio

Conflicts:
	conflito.php
Merge branch 'master' of https://github.com/fabiobca/repositorio

Conflicts:
	conflito.php