Added collisions with game screen
Moved input handling out of player class
Added update function to handle user input
Altered game loop to call currentState's update function
Added rudimentary collision detection
Fixed small bug with collisions