Revert "Revert "Merge branch 'master' of https://github.com/xuruiyang/CS5600""

This reverts commit d5a34525950e8492ec7fb2fde7cee634de7d9c51.