commiting files on my mac now that it is back from the computer doctor
merging files