One hit wonder
Merge branch 'master' into alex
Merge branch 'master' into alex
Fixed swining hit box
Merge branch 'master' into alex