test
test
Merge branch 'master' of https://github.com/lovocas/try_git

Conflicts:
	test.txt