added gitignore
edited txt on local
merge