added help and faq page
fixed conflict issue
Merge pull request #182 from ritesharora89/mybranch

Mybranch