User feedback
Merge branch 'master' of https://github.com/huw12313212/CHI15-GlassGame-Paper

Conflicts:
	SIGCHI2013LaTeX/Section/UserStudy1.tex