Ekstra ting
Merge branch 'master' of https://github.com/DanRJ/testPJrepo

Conflicts:
	Fintfolk.txt

Fikset