added ContactListener
Merge branch 'master' of https://github.com/ushu/z-project

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

Conflicts:
	z-project.xcodeproj/project.pbxproj
cleanup some weird stuff that happened when adding files
add files
rename civilian to .mm
change back to manual memory management