Taxonomy of Game Control
Merge branch 'master' of https://github.com/huw12313212/CHI-15-UserDefinedGameControlWithSmartGlassesInPublicSpace

Conflicts:
	Paper-LaTex/sigchi-sample.log
	Paper-LaTex/sigchi-sample.pdf
	Paper-LaTex/sigchi-sample.synctex.gz