User.class
Student.class
Merge remote-tracking branch 'origin/master'

Conflicts:
	models/User.class.php