Added questions page
Fixed merge conflict