first commit
first commit
Merge branch 'master' of https://github.com/vpolozov/git-training

Conflicts:
	list.txt
merged
merged