adding gitignore
Merge branch 'master' into add_directory
index and additional files