Revert "Revert "Merge branch 'development' of https://github.com/cdegit/cmpt275-group9 into development""

This reverts commit d8c604f5f788e3b216f0c7212cbaf6f6e22b8d1b.
Reverting Development back to my last commit