updating tajindersingh minhas on git
commiting gitignore file
resolved conflict of gitignore