Added synchronization to instrument-changing code; hopefully it's threadsafe now
Updated instrument list
Merge branch 'master' of https://github.com/ireardon/cs32-final
Made several changes, but i think something is wrong now