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

Conflicts:
	app/models/task.rb
added conditional to tasks index view
merged kyle branches