views
Merge branch 'master' of https://github.com/siddharthbhargava/ChatoverCloud

Conflicts:
	ChatoverCloud/public/golive.png