editor
Merge branch 'master' of https://github.com/mjdslob/mathunited

Conflicts:
	Author-java/MathUnited/src/main/resources/configuration.yaml