abs
Merge branch 'master' of github.com:fesnetu/gits

Conflicts:
	test.txt