Merge branch 'ingo'
Merge branch 'master' into developers/bob
bob added file
asd
Merge branch 'master' into ingo
Merge branch 'ingo'
bob is left only with YOLO
Merge branch 'developers/bob'
Merge branch 'ingo'
Merge remote-tracking branch 'origin/master'