file1 and file2
newline in file1
Merge branch 'master' of github.com:nayana2/nayanaProj1