Merge pull request #1 from markusfrykberg/master

hallå?
Merge pull request #2 from markusfrykberg/new-shit

Merge pull request #1 from markusfrykberg/master