fixed bugs. running the program take much longer (~3min)
Merge branch 'master' of https://github.com/haeunchang/CS51-Final-Project