Manual merge with SOHBASE, EPICS library directory, and email messages updated.
Merge pull request #2 from GRIFFINCollaboration/master

Manual merge with SOHBASE, EPICS library directory, and email messages u...