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

This reverts commit 69d7b4165d9611cd812362a02d4a1c021932e010, reversing
changes made to 1a0a4ef28e139aeeb4777556f85d53fd194533b6.