deleted all test files
Merge remote-tracking branch 'origin/master'

Conflicts:
	test_file_new.txt
deleted all test files