faq page
faq page done
Merging issue-73 into develop and resolved conflicts