Met up with Bryan and did some quick merges of smaller branches. After that, we talked about how to get some of the other things that Bryan needs to do to get all of his custom code into the master branch. We are doing a big push to gather up all of the custom code and keep it in one spot. We did some drawings and went through some scenarios of how that process would work and what tasks are needed.