Merge branch 'master' of https://github.com/sklirg/middagshjulet
Merge branch 'master' of https://github.com/sklirg/mysite