updates from meeting w heather
fix merge conflicts
update gitignore
add next steps