Memo.txt changed @test, line added
Merge branch 'master' of https://github.com/nilsbarkald/MyFirstRepo

Conflicts:
	memo.txt