Added support for envelopes as instruments
Merge branch 'master' of https://github.com/xlambein/FSAB1402-Project