first commit
Merge branch 'master' of github.com:XiaoYiQing/myProject3
minus fct