updated gitignore
merged conflicts