txt part
Merge remote-tracking branch 'origin/master'

Conflicts:
	source/HackGame.dev
	source/HackGame.layout
	source/Makefile.win