Merging to get closer to the prize !
Merge branch 'master' of github.com:nkabrown/dispatches

Conflicts:
	app/controllers/comments_controller.rb
	app/views/comments/new.html.erb