level map testing
Merge branch 'master' of https://github.com/cmezak/gordon

Conflicts:
	gordon/gordon/testMap.plist