Made some changes in UserMainPage.gsp
conflict merged
Merge branch 'master' of https://github.com/kenvilar/CSC188-Chat-Messenger