worked on scores
added controller for gamepad
fixed conflicts