Refactored using jDeodorant
Merge branch 'master' of https://github.com/CMPUT301F13T04/Team04Adventure.git