schema update
Fixed association
Merge branch 'master' of github.com:TheNinJedi/home_teaching_app