changed test.txt from windows
commiting conflict fix