creating data model
model relations
before populating db
before populating db
migration changed
MIGRATION maintenance
MIGRATION maintenance+
add user company relationship
new login logic model implementation
stvrtok ending in spot, admin views started
before merge
Merge branch 'rewards1'

Conflicts:
	Gemfile
	Gemfile.lock
	app/models/user.rb
	config/routes.rb
	db/schema.rb