school and course model created
model changes
seed user data
merge conflicts