added questions and responses functionality
merge conflict resolved
Merge pull request #8 from aryssdal/questions_and_responses

Questions and responses