idk what I modified.. sorry
added gitignore
resolved merge conflict