Revert "Merge branch 'master' of https://github.com/JordanLingHua/cs113Project"

This reverts commit e984c62d7aaf370e6afd21a27a3b56958b85ef6f, reversing
changes made to 5529c3925600e32c81586dc1f67cd15d703ffd99.