Fixed hitbox for shield
Merge branch 'master' of https://github.com/ICMediaLab/HelloGame
Merge branch 'master' of https://github.com/ICMediaLab/HelloGame