Bryan and I checked out a branch of code and got it all ready to merge. We had a couple merge conflicts but got everything fixed, pushed, and online. Light testing as well.

This is kinda a fun side note... Bryan and I were talking and I told Bryan that of all of the other developers, he has done the highest number of custom projects. These are not actual numbers, but he said that he did 33 custom projects last quarter. We did some light math and came up with over 400 custom projects in the last 3.5 years. Pretty cool.