just some cleaning up and renaming
Merge branch 'master' of github.com:elunde/prosjektoppgave