another  commit
Merge branch 'master' into my_new_branch