changed gitignore
removed files
merged