Update choice, and tests
Merge branch 'master' of https://github.com/CMPUT301F13T13/StoryHoard