Modified README.md
Modified testfile1.txt
Created testfile2.txt
Resolved conflicts testfile1
Merge pull request #4 from raielin/master

Fixed conflicts in testfile1.txt