add ignore file
get rid of old file
Merge remote-tracking branch 'huiminli/master'