Small fixes, history and choice edits
Merge branch 'master' of https://github.com/CMPUT301F13T01/CreateYourOwnAdventure