Replacing Ockham files with the new files
Merge branch 'master' of https://github.com/humanitiesplusdesign/ockham

Conflicts:
	READMe.md