Add my first file
add another file with some other content
added new stuff
more
more
Merge branch 'my-feature-branch'

Conflicts:
	hallo.txt
removed merge crap
Merge branch 'master' of github.com:greenstevester/mygitrepo