deleted test file
Merge branch 'alex2'