fix
Merge branch 'master' of https://github.com/bars66/school_web