Created Category model and related table
Create category model and join table for categories_tasks.
Merge branch 'master' of github.com:freakinrican1/SkittleMonkies_TaskManager into mtaylor

Conflicts:
	app/models/user.rb
Create new category, assign category to a specific task
Merged master to mtaylor
Merge branch 'master' of github.com:freakinrican1/SkittleMonkies_TaskManager into mtaylor

Conflicts:
	app/views/layouts/application.html.erb
	config/routes.rb
	db/schema.rb
Merge branch 'master' into mtaylor