some repairs
change the gitignore setting
Merge branch 'master' of github.com:Franciscowxp/NewLife