small fixes
solving conflict
Merge branch 'master' of github.com:schoolofma/schoolofma.github.io