add question/answers to questions page
fixed merge conflicts
Merge pull request #14 from joelyawili/question_and_answer

add question/answers to questions page