Fixed buttonMap and playerNumber assignments
Fixing Git one line at a time
Merge branch 'master' of https://github.com/qwv4851/browser-dolphin