Minor bug fix: timestamp in conversations
Merge branch 'master' of https://github.com/Zhanelya/comp3013-new