some changes
Merge branch 'master' of https://github.com/lunyx/cs640_proj2
mergin
Fixed the stuffs