added gitignore
merged conflicts