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

This reverts commit 7fb84ecc63c9d73e147676754410637b4e15168e, reversing
changes made to 5c0d744ec011f376b850ba03ffbc7b013b20ea23.