change from local
Merge branch 'master' of github.com:nickolayrusev/testrepo
a
Conflicts:
	hello.txt