nils.txt added
Line added to nils.txt
Line added to nils.txt 3
Merge branch 'tull'

Conflicts:
	nils.txt
Merge branch 'master' of https://github.com/nilsbarkald/MyFirstRepo