Added flash messages to category and user models
Flash messages
Merge branch 'master' into Jen

Conflicts:
	app/controllers/categories_controller.rb
	app/controllers/users_controller.rb