WIP
merge conflict
Now able to add categories to tasks
Merge branch 'master' into Jen

Conflicts:
	app/models/task.rb
Added form to tasks edit to assign tasks to a user
Added add_user action to task controller
Added add_user action to task controller
Added add_user_path to task routes
added conditional to tasks index view
merged kyle branches
file edits
added links to root_path to all views without
style and convention edits
added tasks_users join table migration, ran db:migrate
migration that isn't wanting to work.
Merge branch 'master' into Jen
Removed erroneous migration file. Hoping it doesn't break everything.
Debugging database issue
rebuilt database -- hopefully that fixed the errors.
Assignment of task to user is now functional