no message
Merge branch 'feature/func1' of https://github.com/gackor/TestGit into feature/func1

Conflicts:
	mytest.txt