Adding no chats message
Merge branch 'master' of github.com:RocHack/grooveboat

Conflicts:
	static/application.js