Merge branch 'master' of https://github.com/jwestgard/DigColl-xml-generator

Conflicts:
	ingest.py
	metadata.csv
fix conflicts
Merge branch 'master' of https://github.com/jwestgard/DigColl-xml-generator

Conflicts:
	ingest.py
	metadata.csv