edit ignore file
Merge branch 'temp1'