merge
merge
Merge branch 'master' of https://github.com/Tommislav/isocade
correct mapping on xbox and windows conditions