tagning ett
Merge branch 'master' of https://github.com/FondinJimmy/gloryanddisgrace