another file called diamond
Merge branch 'master' into newBranch