pull changes
pull changes
conflict removed yml
re integrated faq and modification in style.css
Changes