fixed bugs
Merge branch 'master' of https://github.com/CMPUT301F13T05/Team05_CYOA
fixed local storage and tested it