version 100
fixed conflict
Merge branch 'master' of https://github.com/j0n/CMP-knows-git