Generated user controller and model
Merge branch 'master' of https://github.com/akofink/andrewkofink

Conflicts:
	config/routes.rb