fixing changes
Merge branch 'master' of https://github.com/calebeckert/hc-digital-scholarship

Conflicts:
	README.md