Toan | Updated styles for update feed
Merge branch 'development' of https://github.com/yoshdog/challenge-me into development
Updated merge conflicts