finally finished merging Mary's changes
added gitignore