GitAdapter
Merge branch 'master' of ssh://github.com/JonathanClark11/CPSC410Team24