UPDATE BY Mawin
update config, edit branch
Merge branch 'master' of https://github.com/iYottt/graduatenew

Conflicts:
	application/config/database.php
a