Merge pull request #682 from KevWright/master

Merged and moved content in the guide
Fixed a title that was causing build failure
Merge pull request #195 from TekHus/master

Fixed a title issue