deleting test files
Merge branch 'master' into HEAD