fhljk;
Merge branch 'mitchell'

Conflicts:
	Library Catalog.userprefs
Merge branch 'mitchell'
Merge branch 'mitchell'
Merge branch 'mitchell'
added dashes to library

added dashes
added more dashes to
--
Merge branch 'master' into mitchell

Conflicts:
	Library Catalog.userprefs