fixed player collision ... again
Merge branch 'cindy' into bill
adding in cindy's fixed player collision code