First attempt at this page
Merge remote-tracking branch 'upstream/master' into content/faqs
Capitalisation of title
Merge remote-tracking branch 'upstream/master' into content/faqs

Conflicts:
	faqs/index.html
???
Possibly the new version of the FAQs page
Merge pull request #5 from DeckOfPandas/content/faqs

Content/faqs