comit para fazer o merge
Merge branch 'master' of
https://github.com/ejconsulti/locacaoEquipamentos

Conflicts:
	Locacao/data/database.db