Merge branch 'ingo'
Merge remote-tracking branch 'origin/master'
Merge branch 'master' into ingo
bob added file and removed 1 file + ingos file
Merge branch 'developers/bob'
removing 2 bobs copies
Merge branch 'ingo'