...
Merge branch 'master' of https://github.com/iYottt/graduate

Conflicts:
	application/config/database.php