add .gitignore
and fk renyao
add .gitignore
and fk renyao
Merge remote-tracking branch 'origin/master'