removed duplicate controller action, email works
removed pry from tasks_controller
Merge branch 'master' into kyle
edited user signup form, user model
installed jquery ui
Merge branch 'master' into Jen

Conflicts:
	app/views/tasks/edit.html.erb
Styling for comments section