fiksa ting og tang
Merge branch 'master' of https://github.com/Fellespro/project