Added readme
jshint
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/assets/js/page/room.js