Initial commit from local
Merge branch 'master' of github.com:xqjiang/cvproject2