File added into master
Merge branch 'master' into feature_a
Modified contents on new_file_on_master