Changed background color
installed pry-rails gem
Added Project model and corresponding controller
Completed Projects controller scaffold, & routes
the edit tasks view renders categories
Added project views & progress on new.html.erb
added user_id to categories table
Finished project views & added home pg link
Projects is working. Linked table relationships
Added & migrated projects_users join table
Project MVC completely functional
the 'tasks/new' now only allows user to choose categories user created
task index page css
Merge branch 'master' into sam

Conflicts:
	app/assets/stylesheets/global.css
	app/assets/stylesheets/logins.css
work in progress
work in progress
finshed task edit change
Merge branch 'master' of github.com:heathered/task-project
Merge branch 'master' into jason

Conflicts:
	app/models/user.rb
	db/schema.rb
Merge branch 'master' of github.com:heathered/Task-Project

Conflicts:
	app/views/tasks/edit.html.erb
	app/views/tasks/index.html.erb
	app/views/tasks/show.html.erb