added homepage links
removed html
created activity resource
Added flash messages to category and user models
Activity feed WIP
activity feed working
Activities log first draft
Flash messages
thursday am work
Merge branch 'master' into Jen

Conflicts:
	app/controllers/categories_controller.rb
	app/controllers/users_controller.rb
Merge branch 'master' into paul
resolved merge conflicts.
fixed Login error.