Minor revisions and added merge conflict chapter
Added tips on merge conflict resolution
Fixed a glitch
Fixed another glitch
Cleaned up unnecessary files
Added a few links
Final version
Formatting fix
Added TOC link at the bottom
Added useful links section
Merge pull request #1 from Hindol/master

Update your repo with the latest changes.