fjernet gen
Merge branch 'master' of https://github.com/ajen10/sw604f13-spil-med-lyd into dev