add files to repo
fixing conflict in gitignore