merge
Merge branch 'master' of https://github.com/mfmagnus/KjorCaseStudy
Merge branch 'master' of https://github.com/mfmagnus/KjorCaseStudy
tweak the game