added gitignore
merged