added gitignore to decrease uninteresting conflicts