small tests
Merge branch 'master' of https://github.com/beersbr/GiantsourceCollab

Conflicts:
	zombieDodge/src/gameEngine.cpp