fix player collision
Merge branch 'master' of https://github.com/mfindlater/SCGJ