Removed intermediate class Player, since BUG fix for stuck on edge of block
required collision and movement to be integrated in one function.