Updated All Files

Did not do any additional coding, just combined all of the newest coding
from all team members.