remove things that wasn't inused
changed sound
Merge branch 'master' of https://github.com/filipcarlen/ooproj-18