work on merge.sh, add gitignore, mod to readme