Modifies test1.txt from master
Relolves mergeconflict in test1.txt
Adds test3.txt
Modifiest test1.txt