Add line B in file4
Add line Z in file4
Merge branch 'master' into branch6
Add line C in file3
Merge pull request #6 from magicant/branch6

Add line Z in file4
Add line Y in file1