Update by Mawin
Merge branch 'master' of https://github.com/iYottt/graduatenew

Conflicts:
	application/config/database.php

By Mawin