trying to edit the same file with nick
Merge branch 'master' of github.com:mayfer/git-demo

Conflicts:
	4.txt