Before Docs Testing done
Merge pull request #90 from CMPUT301F13T05/refactoring

Before Docs Testing done