Added anchor points to sections.

Added anchor points so that links can be created to the merge conflict section, etc.
Merged #7 with upstream
Merge pull request #7 from jackmaney/master

Added anchor points to sections.
Fix typo
Merge pull request #15 from Chris911/master

Fix typo