installed pry-rails gem
Added pony gem.
Added email controller.
the edit tasks view renders categories
added user_id to categories table
Emailing sucks.
Why won't pry woooork.
Derp
Merge branch 'master' of github.com:heathered/task-project into heather
Added email functionality
the 'tasks/new' now only allows user to choose categories user created
Renamed submit button
task index page 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
Merge branch 'master' of github.com:heathered/task-project into heather

Conflicts:
	Gemfile.lock
	app/assets/stylesheets/global.css