use this for our project
Merge branch 'master' of github.com:oldwang/2014_CCSP_Final