jar
Merge branch 'Ex11' of https://github.com/snurresvup/DistTextEditor into Ex11

Conflicts:
	.idea/artifacts/DistTextEditor_jar.xml