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