I manually merged our files

Chris, you had added the "opionalMask" argument to "dyePolyfitn" so
overwrote "dyeScan.m" and deleted the temporary one that I had created
to troubleshoot the syncing problem.