Добавен е 1 ред.
Merge branch 'master' of https://github.com/nakov/test-project

Conflicts:
	Tanya.txt