merge error fixed
Merge branch 'master' of https://github.com/TDC-bob/bobgit