Added .gitignore file
confilict resolved