hdjmfmn
Merge branch 'hotfix/hotfix'
Merge branch 'master' into feature/skapa_filer

Conflicts:
	Testfile1.txt
proper merge
Merge branch 'feature/skapa_filer' into develop