MENU FOR LEVEL 2
Fix map issues
Improve handling of collidables
Merge branch 'master' of https://github.com/ushu/z-project

Conflicts:
	z-project.xcodeproj/project.pbxproj
Merge branch 'master' of https://github.com/ushu/z-project