Removed Session in Layouts
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
Merge branch 'master' of github.com:freakinrican1/SkittleMonkies_TaskManager into cburkley
Debugged emailer
Merge branch 'master' of github.com:freakinrican1/SkittleMonkies_TaskManager into mtaylor
Merge branch 'master' of github.com:freakinrican1/SkittleMonkies_TaskManager into katie

Conflicts:
	app/controllers/tasks_controller.rb
	app/views/tasks/new.html.erb
Add a comment on a task show page
Fixed merge conflicts, accidently added all files before fixing conflicts.
Merge branch 'master' of github.com:freakinrican1/SkittleMonkies_TaskManager into mtaylor

Conflicts:
	app/controllers/tasks_controller.rb
	app/views/tasks/show.html.erb
	config/routes.rb
	db/schema.rb
Merge branch 'master' of github.com:freakinrican1/SkittleMonkies_TaskManager

Conflicts:
	app/controllers/tasks_controller.rb
	app/views/tasks/show.html.erb
	config/routes.rb
	db/schema.rb
Merge branch 'master' into mtaylor

Conflicts:
	app/controllers/tasks_controller.rb
	config/routes.rb
mod schema
Fixed create task bug
Bug fix for non-existent category or project on task show page
Added new CSS
Added username to comments
Merge branch 'master' into cburkley
Merge branch 'master' of github.com:freakinrican1/SkittleMonkies_TaskManager

Conflicts:
	app/assets/stylesheets/global.css
WIP