work in progress categories/tasks
commented out dropdown
changed model habtm
re-submitt nav bar
Merge branch 'master' into paul
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