Xinyi: added the portion for the 6th person
Merge https://github.com/xinyichen/CS-2340-Project