first commit
I try to push the project
Merge branch 'master' of github.com:gongzhen/cs585finalproject
finish the merge