Merge branch 'master' of https://github.com/CS3216/Mobile-Group-5
Merge pull request #3 from CS3216/murali_chatting

Murali chatting
Merge branch 'master' of https://github.com/CS3216/Mobile-Group-5
Merge branch 'master' of github.com:CS3216/Mobile-Group-5
new code
fixed stack overflow error!

the div----button link was causing it!!!!
profile bug fix
Merge branch 'master' of github.com:CS3216/Mobile-Group-5
remove icon from list
from server
Revert "from server"

This reverts commit 6d3dabe365cfea6932188647378ada32a0207b51.
change css
remove css pic
revise read me
merge
Merge branch 'master' of github.com:CS3216/Mobile-Group-5
revise readme
revise readme
resolve conflit
revise REST API GUIDE