coding game panel
Merge branch 'master' of ssh://project-huangxx2155.rhcloud.com/~/git/project
	modified:   room/get_room.php
	modified:   room/room.js
Merge branch 'master' of ssh://project-huangxx2155.rhcloud.com/~/git/project
coding game panel
Merge branch 'master' of ssh://project-huangxx2155.rhcloud.com/~/git/project
coding game panel
space
Merge branch 'master' of ssh://project-huangxx2155.rhcloud.com/~/git/project
order
coding game panel
Merge branch 'master' of ssh://project-huangxx2155.rhcloud.com/~/git/project
coding game panel
coding game panel
order
Merge branch 'master' of ssh://project-huangxx2155.rhcloud.com/~/git/project
coding game panel
Merge branch 'master' of ssh://project-huangxx2155.rhcloud.com/~/git/project
delete comment
	modified:   room/get_room.php
	modified:   room/room.js