vai la tuliao
Merge branch 'master' of https://github.com/tuliobraga/whatsplace

Conflicts:
	backend/app.js
	backend/views/login.html
	backend/views/nova_conta.html
merge
Revert "fix error messages"

This reverts commit 0831a0dade2dae37f5701c98835c570f2a7feed6.