Updating Files on Test Branch with Garrett's lastest version

I have created a test branch and I am putting all of Garrett's changes, as of Feb 1st, on test branch. If we want to, we can merge this branch with the master branch.