Oh boy
Merge branch 'master' of github.com:heathered/Task-Project into jason
Merge branch 'master' of github.com:heathered/Task-Project into jason
modified comments, projects and tasks controller to move destroy method call on instance
Merge branch 'master' of github.com:heathered/Task-Project into jason

Conflicts:
	app/controllers/comments_controller.rb
	app/controllers/projects_controller.rb
	app/controllers/tasks_controller.rb
Merge branch 'master' of github.com:heathered/Task-Project into jason
Merge branch 'master' of github.com:heathered/Task-Project into jason
refactor comments_controller.rb
modified logins controller to handle no email provided
Merge branch 'master' into jason

Conflicts:
	app/controllers/logins_controller.rb