Fixed Moving Collision Box
Collision Boxes better
Merged with Develop and Fixed a bug with Sword
Merge pull request #226 from 4950/Brandon/MoveCollisionBox

Brandon/move collision box