Robot enemies can now attack the player if player gets too close to them 
Cat won't scratch player as often if player steps on it
Merge branch 'master' into catsrabbits
Merge branch 'master' into catsrabbits
PacManGhost now uses implementation of PlayerMotionWatcher
minimap changed
resolved conflicts in BaseballBatWeapon and LaserGunWeapon