profile student
Merge remote-tracking branch 'origin/master'

Conflicts:
	profile_student.php
Merge branch 'master' of https://github.com/Deuanz/SWproject