resolved Longley conflicts
Merge branch 'master' of https://github.com/emory-libraries-beckctr/belfast

Conflicts:
	.DS_Store
	xml/longley1.xml