Uploading gitignore
Merge branch 'master' into junior-dev