Merge branch 'master' into task2

Conflicts:
	student.dtd