Mise en page edit
Merge branch 'master' of https://github.com/aurrelhebert/HighSchoolMilano