added a file on branch
Added second file on branch
File added into master
Merge branch 'master' into feature_a
added contents