update status ta
Merge branch 'master' of https://github.com/Wahyufitriani05/Tugasku

Conflicts:
	system/application/config/database.php