Update 07-troubleshoot.html.md
Merge branch 'master' of https://github.com/mrs...

...onord/documentation into greduan

My first command line pull request merge! :)
Fixed the new merge a bit...