Merge remote-tracking branch 'origin/task2'

Conflicts:
	student.dtd