Fixed a bug that allowed the player to punch himself
Merged in HUD
Merge branch 'RussForThursday' into dunk_test