Change "git" to "25". Fixes 25
Modify and add files in VS.
Merge branch 'testing'