testEditFragment errors-cannot perform onPause/update method of story controller
testEditChoice pass
Merge branch 'master' of https://github.com/CMPUT301F13T08/CMPUT301F13T08