Merge branch 'mtaylor' of github.com:freakinrican1/SkittleMonkies_TaskManager
Merge branch 'mtaylor' into katie
Merge branch 'mtaylor' of github.com:freakinrican1/SkittleMonkies_TaskManager into katie
preparing to merge with master
everything added AND removed before merge with master
Merge branch 'master' into katie
fixed new and edit tasks view with project and category dropdown menus
drop down menus working, join table not saving, merging to show beth though
Added email functionality when assigning a task
Merge branch 'master' of github.com:freakinrican1/SkittleMonkies_TaskManager into mtaylor

Conflicts:
	app/controllers/tasks_controller.rb
	app/views/tasks/new.html.erb
Debugged emailer