hdjmfmn
hshs
Merge branch 'hotfix/hotfix' into develop
Merge branch 'master' into feature/testing_2
Merge branch 'master' into feature/skapa_filer

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

Conflicts:
	Test2.txt
Merge branch 'develop'