modified penghargaan
edti penghargaan

Conflicts:
	application/controllers/Profil.php