Errors fixed, sorry about that. I'm now branching out.
Merge branch 'master' of https://github.com/CMPUT301F13T07/Team07Story.git