modify .gitignore
Merge remote-tracking branch 'origin/fea_comp_obj' into fea_comp_obj