Resolved conflict
Merge branch 'master' of https://github.com/prigazzi/coolcademy