more refractoring
Merge branch 'master' of https://github.com/CMPUT301F13T11/Team11AdventureBook