Slight hitbox update

And taking a look at pull request settings.
Merge remote-tracking branch 'upstream/master'
Fixed collision for player

The collision now accurately accounts for hitbox offsets when
calculation what direction to move to correct the collision for the
player.
Missed a change

I need to learn to do a final check before comitting -_-
Merge pull request #66 from wildex999/master

Collision fix for CPlayer