committing from newtest
Merge branch 'master' into newtest
added testdir to .gitignore