first change from philipp
nothing but the truth
This is a plain test
Merge remote-tracking branch 'origin/master'
ruby rocks
 bvmcn
Merge remote-tracking branch 'origin/master'
do the conflict
dings
sadsadasdqqq
Merge branch 'master' of https://github.com/scandio/git-tutorial
dings
Merge branch 'master' of https://github.com/scandio/git-tutorial
Merge remote-tracking branch 'origin/master' into development