First addition to file A of branchA
Added file B
changed to match master
added E
Merge branch 'master' into branchA