Fixed display of user assignment
Merge branch 'master' into Jen
removed duplicate controller action, email works
removed pry from tasks_controller
Merge branch 'master' into kyle
edited user signup form, user model
Added comment model and comments table to db
Added has_many through relationships to models
Removed "through" component of relationships.
installed jquery ui
Added comment functionality and display on task pages
Formatting of display comments
Added a "delete" button to the edit task page
Added user assignment list to the task index page
Merge branch 'master' into Jen

Conflicts:
	app/views/tasks/edit.html.erb
getting table rows to move
fixed merge conflict
generated migration
migrated order column to tasks table
task ordering system