school,teacherframe edit
Merge branch 'master' of https://github.com/supergonteta/swp-prototyp