Create newFile
Delete newFile
Update some file.txt
upd
Merge branch 'master' of https://github.com/yaroslav-dudar/testrep into branch1

Conflicts:
	some file.txt
Merge pull request #8 from yaroslav-dudar/branch1

add some file