added gitignore
updating gitignore. don't make me fix conflicts all day