add dummy history, demo
Merge branch 'master' of https://github.com/lisajluo/smg-server into jinxuanwu-player
Demo page - live URL
Merge remote-tracking branch 'origin/container-ruixue'
.gitignore
change scoreChange to score; endGame update;
Merge remote-tracking branch 'origin/jinxuanwu-player'
Entity property fix
pre
fix demo
Merge branch 'master' into container-ruixue

Conflicts:
	.gitignore