wat
Updated player, scales, keys
Merge branch 'master' of https://github.com/ireardon/cs32-final