made some changes
Merge branch 'master' of github.com:Alyssa098/task_manager

Conflicts:
	app/controllers/logins_controller.rb
	config/routes.rb