* Finished user activate
+ Started blessures
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/users_controller.rb
	config/routes.rb
* Finished user activate
+ Started blessures