Change from location 1
Merge branch 'BRANCH_ONE' of https://github.com/jmaralv/git_testing into BRANCH_ONE