modified file1 in its old folder
Merge branch 'master' into br