git ignore added
Merge branch 'dev' into env-setup
git ignore updated