DOOM
WIP
Session fiddling.
Session!
Activities table
included gem stuff
Trying to make gem work.
Added activity feed
Merge branch 'master' into heather
Merge remote-tracking branch 'origin' into sam

Conflicts:
	app/controllers/comments_controller.rb
Adjusted controller for public_activity gem