gitignore added
added script and input and output
conflict solved