Added a new file
Added additional file
Added line
Modified additional file on master
Modified additional_file
Merge branch 'master' of github.com:marcheing/testing_git