merge
Merge branch 'master' of https://github.com/gummie4444/Lyfskammt
merge fjor
autu dev server commit