five to temp.txt
added three.txt
added four back to temp.txt
Merge pull request #1 from danielmarvin/branch2

New modifications to your temp.txt file
Merging daniel marfgin's change ins, they look good