Add line of text to master, while origin has been changed.
Merge branch 'master' of git@github.com:sstrentzsch/projdev14

Conflicts:
	Test/text.txt
foo