tog bort konflikt helt
Merge branch 'master' of https://github.com/lilachoklad/MAPappen