this is going up now
Merge branch 'master' of https://github.com/foucodian/school
here it comes

e Please enter a commit message to explain why this merge is necessary,
changes from the local ver