Deleting wrong version of gitignore
Manual Merge