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

This reverts commit 68f3796662e15c37c0c5b8770c8eff010d22549a.
Revert f1eb62e..312c2e7

This rolls back to commit f1eb62e5aac7655a97cb4739986f2dc3afa7218e.