doc - conflict
Merge branch 'master' of github.com:gkazior/gitfun