login
Merge branch 'master' of https://github.com/raffaelnagel/TrabalhoWEB

Conflicts:
	config/routes.rb
	db/schema.rb
	log/development.log
login
login
login
login