Issue #101 - fixing in progress
Issue #101 - fixing in progress
Merge branch 'master' of https://github.com/lpissinali/school
Merge branch 'master' of https://github.com/lpissinali/school

Conflicts:
	page10-6c.php
	page10-6d.php
Issue #104 - fixing in progress
Issue #104 fixed, pending verification