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

Merged and moved content in the guide