fullscreen test
Merge remote-tracking branch 'origin/master'

Conflicts:
	main.cpp

	modified:   MapEngine.cpp
	modified:   makefile
	modified:   makefile-win