Added User Controller
Merge branch 'master' of github.com:TygerWolf/mobilemc

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/stylesheets/application.css
	app/views/layouts/application.html.erb
	app/views/tracks/index.html.erb
	db/schema.rb