Files merged

Successfully merged in the files, pushing all changes back upstream into
the master branch