Merge add-faq
Merge pull request #285 from github/add-faq

Merge add-faq