Merge branch 'hotfix' of github.com:tsheasha/SkillAcademy
Merge branch 'master' of github.com:tsheasha/SkillAcademy