Update the cdnjs version on the FAQs page.
Remove missed merge conflict code.
Merge branch 'master' of github.com:philipwalton/html-inspector