Eric, John, Cory, and I were working on getting a testing branch up on the developer's box as a testing server. We had to fix some files, do some merging, and try a few things. This is kinda new for us and we weren't super productive, first time on this box. We fixed a few files and resolved some merge conflicts. I ran out of time and John, Cory, and Eric kept going after I bailed out to work with Bryan.