catching up local copy
Merge branch 'master' of https://github.com/aaronplasek/epigraphscraper

Conflicts:
	TEST-Database/epigraphscraper-working.py