added answerPoints
fixed merge conflicts"
Merge pull request #28 from jgypsygrrl/master

added answerPoints