s
conf
Merge branch 'master' of https://github.com/vatsn1010/room.git

Conflicts:
	room/WebContent/assets/js/server.js