Re-added the not-so-useless voix() wrapper, removed weird 'this'
Begun echo effect
Merge branch 'master' of https://github.com/xlambein/FSAB1402-Project
Fixed Merge
Fixed the 'Merge' fix