merging gitignore back in