kalin commit 2
Merge branch 'master' of https://github.com/atanas-tsankov/Gittutorial

Conflicts:
	test.txt