zombies die cowboys shoot and zombies hunt
Merge branch 'master' of https://github.com/dshavoc/LargeImagesDan.git

Conflicts:
	src/com/example/largeimagesdan/AnimatedObject.java