Updated FAQ page
merged caitlin's branch with test branch