Finished merging/integrating our code. I commented out the change to the camera movements because the camera already strafed correctly as it was. On my todo list for tomorrow is to make it free moving rather than rotatign around the center.