Use keyboard instead of joystick
Merge branch 'master' into Robbin
Remapped game pad input to work with xbox 360 controller (not done)
Merge branch 'master' into Robbin
The game pad mode now assumes you use an xbox 360 controller (probably mapped some keys wrong)