Merge pull request #9 from schoolofma/content_

update faq