hello
add text
Merge branch 'develop'

Conflicts:
	README
wurstsuppe
add readme.md
gna gna gna
asdfas
Merge branch 'master' of github.com:idrewing/test
Merge branch 'develop'

Conflicts:
	README.md
dingong
Merge branch 'master' of github.com:idrewing/test
add some testing foo