Merge pull request #9 from schoolofma/content_

update faq
Merge pull request #10 from schoolofma/master

Merge pull request #9 from schoolofma/content_