changes to defender, zombie
Merge branch 'master' of https://github.com/elake/assignment4
mixed/fixed stuff