contact table setup
added gitignore
fixed merge conflict