Merge pull request #243 from ktf/gh-pages

Add a tutorial on how to use git-cms-merge-topic.
Add tutorial on how to merge usercode and CMSSW.