index and faq complete
first merge