Edit first file
Edit2
Merge branch 'master' of github.com:wolktm/tut

Conflicts:
	first.txt