Merge
Merge branch 'dev' of https://github.com/zippeellii/Krogkollen into dev