skapade testfil.txt
Merge origin/master

Conflicts:
	testfil.txt