Modified README.md
Update testfile1.txt
Modified testfile1.txt
Created testfile2.txt
Resolved conflicts testfile1