Lehrer changed
Merge branch 'other'

Conflicts:
	src/Lehrer.java