test
removed conflict
added config file
Merge branch 'master' of https://github.com/beersbr/GiantsourceCollab

Conflicts:
	zombieDodge/osx/ZombieDodge/ZombieDodge.xcodeproj/project.pbxproj
	zombieDodge/src/Main.cpp