1. script commit
Merge branch 'master' of https://github.com/bleujin/talkserver

Conflicts:
	script/room.script