Almost fixed the thing
Merge branch 'master' of https://github.com/JoachimHolmer/Rymdkyrka