Merged and moved content in the guide
Merge pull request #194 from TekHus/master

Merged and moved content in the guide
Merge branch 'master' of https://github.com/KevWright/documentation into KevWright-master
Merge branch 'KevWright-master'
Merge pull request #682 from KevWright/master

Merged and moved content in the guide