Updated .gitignore file
Merged origin/master with local repo and updated .gitignore file