pre
fix demo
Merge branch 'master' into container-ruixue

Conflicts:
	.gitignore
Merge branch 'master' of ssh://git@github.com/lisajluo/smg-server.git

Conflicts:
	.gitignore
Merge branch 'master' into container-ruixue
demo v2
demo file
versionTwo.html
gitignore
Merge remote-tracking branch 'origin/container-ruixue'

Cleaning files and updating gitignore
Merge remote-tracking branch 'origin/developer-huan-2'
Fix bug in GET gameinfo/
save
merge
fix