commit teste conflito
Merge branch 'master' of
https://github.com/Sigacon/Guia-Comercial-Mobile.git

Conflicts:
	teste.txt