nav bar changes
created Category model and Categories controller
set up HaBtM relationship, added resource to routes
created join table migration
added join table script to migration
edited categories_tasks migration
migrated categories_tasks join table
finished categories scaffold
merge conflicts resolved
css nav bar login added
new font used
Merge branch 'master' into paul

Conflicts:
	app/views/layouts/application.html.erb
Now able to add categories to tasks