stuff added
firstFile.txt merged with kdiff3