Merge branch 'task2'

Conflicts:
	student.dtd