updated settings, controls can now be changed
Merge branch 'master' of github.com:Adalden/asteroids2