Revert "Bug fix 1"

This reverts commit db29eb060789d128d001fefc3c8136d0fa600882.

Conflicts:
	php/function.php
	student/index.php
Revert "Revert "Bug fix 1""

This reverts commit b358e145817105b0d053034edaefbc79249fe6ad.