second commit
Merge branch 'master' of github:DaiFeng2014/ProjectOne