jh
Merge branch 'master' of https://github.com/firmanfiqri/alumniipb85

Conflicts:
	application/controllers/alumni.php
aksd