add git ignore file.
Merge branch 'master' into develop