Issue #94 fixed, pending verification
Issue #95 fixed, pending verification
Merge branch 'master' of https://github.com/lpissinali/school

Conflicts:
	page10-2e.php