fixat lite problems
ny pull, solve conflict
solve conflict
solve conflict
Merge branch 'master' of https://github.com/Kommode/kommode
snygga till kod