fixed so that player can not go above top of canvas
merge
Now functional circle to rectangle, and rectangle to rectangle collision detection