Reverting bad commits made that overwrote changes in the master branch

This reverts commit 59b3c1fa47c4de5549ce7e691cefe921dfbb39b6.
Merge branch 'master' of https://github.com/CMPUT-301F14T10/project