ganti setting database
ganti setting database
ganti setting database
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	application/config/database.php
buku tamu update 2
Merge remote-tracking branch 'origin/develop' into develop