user_controller 0.5
user_controller 1.0
Merge remote-tracking branch 'origin/master'

Conflicts:
	config/routes.rb