little updates
Updates
Merge branch 'master' of https://github.com/shansrinivasan/trollchat
Merge branch 'master' of https://github.com/shansrinivasan/trollchat
ss
Merge branch 'master' of https://github.com/shansrinivasan/trollchat
ud
Merge branch 'Ryans'
Merge branch 'master' of https://github.com/shansrinivasan/trollchat