commenting
Merge branch 'hw10' into hw13

Conflicts:
	ChangeLog