Issues #62 and #63 fixed, additional styling required
Merge branch 'master' of https://github.com/lpissinali/school