STN
Merge branch 'master' of https://github.com/newsoo/gittraining

Conflicts:
	file1.txt