erro de persistencia/gambiarra no login
	modified:   conf/application.conf
Merge https://github.com/BrendhaCruz/projeto1-si1

Conflicts:
	README.txt
	app/controllers/Application.java
	app/controllers/Planejamento.java
	app/views/index.scala.html
	conf/application.conf
	conf/evolutions/default/1.sql
	conf/routes
Merge https://github.com/BrendhaCruz/projeto1-si1

Conflicts:
	README.txt