updated gitignore and readme
fixed merge conflict in gitignore