das
ok
Merge branch 'master' of https://github.com/chriZ1990/testRepo

Conflicts:
	newFolder/hello.txt