win32 window added
Merge remote-tracking branch 'origin/master'

Conflicts:
	source/Library/game.cpp