got user table and test to be green
add default for admin
gemfile issue
Merge in users
Merge commit
Merge branch 'master' of github.com:brettshollenberger/movie_reviews into add_movie_model

Conflicts:
	config/routes.rb
	db/schema.rb
	spec/spec_helper.rb