add gitignore
update ignore
Merge branch 'master' into dev