add testInput to .gitignore
merge