merging
Merge branch 'master' of https://github.com/CMPUT301F13T08/CMPUT301F13T08
working on solving add choice/update story
Merge branch 'master' of https://github.com/CMPUT301F13T08/CMPUT301F13T08