Wout: Did some stuff on the keyboard control
Merge branch 'master' of https://github.com/frostraver/IP2