added midi functionality, now music can be played, MIDI.js must be used, it is not included in the repo
fixed merge conflict