adding .gitignore
attempting to merge josh's changes with elnaz's changes
resolving merge conflicts