Hitbox changes
Whitespace error snuck past
Merge branch 'develop' into fix-hitboxes
Merge develop
Merge pull request #31 from FAForever/fix-hitboxes

Fix hitboxes