WHY CAN'T I COMMIT

Nevermind.
Commit Take 2
Merge remote-tracking branch 'origin/victors_test_branch'
Merge branch 'master' of https://github.com/jsextonSIT/GlenRockRepo