Edit file1
Merge branch 'master' of https://github.com/Kikiii/remoteRepository