Login devise e facebook feito com sucesso
Merge branch 'Devise' of https://github.com/dvmarcilio/meajudanisso into Teste-Merge

Conflicts:
	Gemfile.lock
	app/helpers/sessions_helper.rb
	app/models/user.rb
	config/routes.rb
	db/schema.rb
	features/step_definitions/logar_steps.rb