took out story id from choice, choicemanager, and general controller
Merge branch 'master' of https://github.com/CMPUT301F13T13/StoryHoard