fix bugs and other small
Merge branch 'master' of github.com:heathered/Task-Project into jason
Merge branch 'master' of github.com:heathered/Task-Project into jason
Task assignment half finished, works but should look better.
still tweaking task assignment feature.
Minor fixes
Remove list style
Gem Stringex
Playing with css/layout
change /task/url/edit
able to choose category for task, or create a category
Merge branch 'master' of github.com:heathered/task-project into diana

Conflicts:
	db/schema.rb
CSSing
Removed bindings
Merge branch 'master' into jason

Conflicts:
	app/controllers/tasks_controller.rb
	app/models/task.rb
WIP
Merge branch 'master' of github.com:heathered/task-project into heather

Conflicts:
	app/views/tasks/show.html.erb
Fixed variable bug