styled faq
pulled some stuff and need to commit
fixed table
Fixed merge conflict