no message
Merge branch 'master' of https://github.com/huw12313212/CHI-15-UserDefinedGameControlWithSmartGlassesInPublicSpace

Conflicts:
	Paper-LaTex/sigchi-sample.tex
Merge branch 'master' of https://github.com/huw12313212/CHI-15-UserDefinedGameControlWithSmartGlassesInPublicSpace