a bunch of school stuff
Merge branch 'school_dev'