unclear changes 2
merged
updated .gitignore
updated .gitignore