with chat
Merge branch 'master' of https://github.com/KarthickSelvam/VirtualClass

Conflicts:
	public/js/client.js

with conflict