del file and add ignore file
Merge branch 'master' into branch2