annotate gem added
Merge branch 'master' of github.com:wh1tney/SalesForceSilverCloud

Conflicts:
	app/controllers/users_controller.rb