merges
changes to gitignore