updates and adds
Merge branch 'master' of https://github.com/portiad/school