test neu
der erste commit yay!
test2
Merge branch 'maiksBranch' into develop
Merge branch 'develop' of github.com:pohlandreas/superTest into develop
shake it baby
added foobar
rehallo
s
Merge branch 'feature/testing' into develop
Merge branch 'develop'

Conflicts:
	index.html