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
Can now add tasks to projects
Merge branch 'master' of github.com:kschmit90/TaskManagerProject
Added task/project relationship to views
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
work in progress categories/tasks
commented out dropdown
changed model habtm
re-submitt nav bar
Merge branch 'master' into paul
Merge branch 'master' into LeKohrs