修小地方
Merge branch 'master' of https://github.com/huw12313212/ICMI_2014_Demo_GlassGame

Conflicts:
	ICMI/ICMI'14_Demo_GlassGame.fdb_latexmk
	ICMI/ICMI'14_Demo_GlassGame.log
	ICMI/ICMI'14_Demo_GlassGame.pdf
solve conflict
Merge branch 'master' of https://github.com/huw12313212/ICMI_2014_Demo_GlassGame

Conflicts:
	ICMI/ICMI'14_Demo_GlassGame.fdb_latexmk
	ICMI/ICMI'14_Demo_GlassGame.log
	ICMI/ICMI'14_Demo_GlassGame.tex