Add ratings to Unit model
Scaffolds
Merge branch 'master' of https://github.com/RITWECode/asdfStuck
Ratings scaffold
Merge branch 'scaffolds'
Join tables
More model fun
Merge branch 'models'

Conflicts:
	db/schema.rb
Merge branch 'master' into weronica

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