Chnages to Question and Answer
Merge pull request #76 from erboyle/master

Chnages to Question and Answer