no message
Merge branch 'master' of https://github.com/cxsshaw/beta_ci

Conflicts:
	application/models/student.php