make models and populate db
Merge branch 'master' of github.com:stewsmith/social_courses

Conflicts:
	app/models/user.rb