Testando conflitos no github
Merge branch 'master' of https://github.com/allanroberto18/AppPHP.git

Conflicts:
	README.md