erro doido que Gustavo tá tentando reproduzir.
Merge branch 'master' of https://github.com/YgorCr/FifaTickets

Conflicts:
	index.php
aff