small change

small change
Merge remote-tracking branch 'origin/master'

Conflicts:
	source/HackGame.dev
	source/HackGame.layout
	source/Makefile.win
Merge branch 'master' of https://github.com/RainbowDreamGroup/TinyGame

Conflicts:
	source/HackGame.layout