Merge pull request #24 from JSchulhof/master

wave files work
Merge branch 'master' of https://github.com/JSchulhof/wdi-group-project into JSchulhof-master
Merge branch 'master' of https://github.com/kaifius/wdi-group-project