Adjusted collision

I adjusted the way that the player object dealt with collision so as to
prevent the game from hanging if the player was pushed out of the
window.