added school to users db
Merge branch 'master' into updating-users

Conflicts:
	db/schema.rb