jeg var sist
Merge branch 'master' of https://github.com/andybb/testrepo

Conflicts:
	test.txt
Merge branch 'master' of https://github.com/andybb/testrepo