room stuff
Merge branch 'master' of https://github.com/jianshentan/cs032_game
collision fixed