Merge branch 'master', remote-tracking branch 'upstream/master'
Added doc for reverting and merging upstream
Added docs for renaming branch on git
Merge pull request #2 from SiddharthMantri/master

Added git merging upstream and git revert docs