made fixes to get tasks index view to work
made some changes to views
Merge branch 'master' of github.com:Alyssa098/task_manager into adam

Conflicts:
	app/models/task.rb
made changes to project show view, and tasks, can now see tasks associated with views
added belongs_to :user
Merge branch 'master' into adam

Conflicts:
	app/views/projects/show.html.erb