added control and key constants and added super game object and added controls to the player object
solved merge issues