Fixed VoixToAudio (only lists of samples!), and that fixed Echo, too
Added a shorter version of joie
Merge branch 'master' of https://github.com/xlambein/FSAB1402-Project

Conflicts:
	mix.oz