Added faq
final changes to faq
Merge branch 'faq'