teste
Merge branch 'master' of https://github.com/gaugusto/HelpMeNow

Conflicts:
	HelpMeNow.pro.user
Banco de dados e view
Merge branch 'master' of https://github.com/MatheusLiberato/HelpMeNow

Conflicts:
	HelpMeNow.pro.user