Updated .gitignore and README
Fixed merge conflict