update new
Merge branch 'master' of github.com:Alyssa098/task_manager
index for users
Merge branch 'master' of github.com:Alyssa098/task_manager
tasks all there
Merge branch 'master' of github.com:Alyssa098/task_manager

Conflicts:
	app/views/tasks/new.html.erb