css changes
conflict resolved
css changes2
Merge branch 'master' of https://github.com/emocentmagar/brilliantedu into mitav
Merge pull request #13 from emocentmagar/mitav

Mitav