merge local version
add large test files to gitignore