Merge branch 'master' of https://github.com/curateteaching/digitalpedagogy

Conflicts:
	README.md