correcoes no routes
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
correcoes login
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	config/routes.rb
correction login