Fixed Mix, added envelope
Merge branch 'master' of https://github.com/xlambein/FSAB1402-Project

Conflicts:
	code.oz