Updated flocker, and added collision

Note what collision detection does:
- it changes the actionType, based on the type of object it collides
with. look to heroObject for more details
- so an object's action will be based on actionType (ie, whether it
moves/attack lady/attack player) and also affects whether a player can
punch(eg, player can only punch when the hero.selfType == 1)