Refactored some names due to group disaproval
Merge branch 'master' of https://github.com/CMPUT301F13T13/StoryHoard