My test 4 commit
Merge branch 'master' of https://github.com/Storkur/myproj

Conflicts:
	test.txt