committing the two line version of special file
Merge branch 'master' of c:/Users/micki_000/git_repos/test-repo