merge from test, changed .gitignore