fix task and users
Merge branch 'master' of github.com:Alyssa098/task_manager

Conflicts:
	app/views/users/new.html.erb
Merge branch 'master' of github.com:Alyssa098/task_manager
fix new users