names...
Merge branch 'master' of https://github.com/RobinDumontChaponet/trombinoscope

Conflicts:
	models/student.class.php