Könnt mich noch jemand ins Wiki aufnehmen?
Merge branch 'upstream'
implemented puber jail
Merge pull request #27 from HelloTree/master

Könnt mich noch jemand ins Wiki aufnehmen?
Merge remote-tracking branch 'upstream/master'
changed readme to provoke conflict
another chnage in readme
Merge branch 'featurebranch' into f2

Conflicts:
	README.md
moar editong README.md
moar changes
Merge branch 'f2' into featurebranch

this merge is necessary,
lalala
Merge branch 'featurebranch'
test
test
Merge branch 'master' into f2

Conflicts:
	xxx
hodor merge

Merge remote-tracking branch 'remotes/wizard23remote/master' into hodorbranch