Resolved merge conflicts
Merge branch 'master' of https://github.com/trewtzu/JAC-RMIT-OSP
Merge branch 'master' of https://github.com/trewtzu/JAC-RMIT-OSP
Cleaned up music folder