Revert "Revert "Revert "Revert "Merge branch 'master' of https://github.com/CMPUT301F14T09/Team09Project""""

This reverts commit 6ada9cdb3a37beb879fa5c5fff68ab8acf3d4223.