debugged
Merge branch 'master' of https://github.com/emocentmagar/brilliantedu into krazz
Merge pull request #48 from emocentmagar/krazz

Krazz