Toan & Nikesh | Fixed tests
Nikesh & Toan | Updated tests
Merge branch 'development' of https://github.com/yoshdog/challenge-me into development
Toan | Added comment button icon
Fixed merge conflicts
Merge branch 'development' of https://github.com/yoshdog/challenge-me into development