gitignore added
merged