colocando verificação de usuário
Merge branch 'master' of https://github.com/DiegoCamilo/TCC

Conflicts:
	app/controllers/application_controller.rb
aa