changed first paragraph and added new one
second commit added new paragraph
3 replaced first paragraph whit new one
Merge branch 'master' of github.com:LDreptate/gitBash

Conflicts:
	test.txt