Nearly final version
Final version
Merge branch 'master' of https://github.com/changkon23/SOFTENG-206

Conflicts:
	my_audio_mixer.sh
Done