change class name
Merge branch 'master' of github.com:ushu/z-project
trim civilian png
make velocity public
add flag
more work on collision code
weird project change
work in progress
kill civilians when meeting a zombie
Merge branch 'master' of github.com:ushu/z-project

Conflicts:
	z-project/GameLayer.mm