Hoppas det funkar nu lol
Merge branch 'Patrik'