added ability to answer questions
fixed conflicts
Merge pull request #29 from brain-murphy/elizabeth

Elizabeth