+換template
Merge branch 'master' of https://github.com/huw12313212/ICMI_2014_Demo_GlassGame

Conflicts:
	SIGCHI2013LaTeX/GlassGameUISTDemo.aux
	SIGCHI2013LaTeX/GlassGameUISTDemo.fdb_latexmk
	SIGCHI2013LaTeX/GlassGameUISTDemo.log
	SIGCHI2013LaTeX/GlassGameUISTDemo.pdf
	SIGCHI2013LaTeX/GlassGameUISTDemo.synctex.gz