final version
Merge branch 'master' of github.com:chaofeng2014/499-450CSPproject