final version
Merge branch 'testing' of github.com:jappeace/hw-isgp-kbs into testing

Conflicts:
	ISGPKBS/Game/Window.cpp