crossbow kills enemies, added Pet collision type
Merge branch 'master' of https://github.com/schs/compro2013