edited existing line
fetched
committed
Merge branch 'master' of git@github.com:sstrentzsch/projdev14

Conflicts:
	Test/text.txt