Merge pull request #44 from kmblake/Eric-test

multiplechoicemultipleanswer supported
Merge branch 'master' into Eric-test