my changes
updated gitignore
merge remote changes, fixed merge conflict