user controller
Merge remote-tracking branch 'origin/master'

Conflicts:
	config/routes.rb
user controller