update ignore file
merge in master