lf
Merge branch 'master' of github.com:taufiksu/melisa
Merge branch 'master' of github.com:taufiksu/melisa
Merge branch 'master' of github.com:taufiksu/melisa
Merge branch 'master' of github.com:taufiksu/melisa
Merge branch 'master' of github.com:taufiksu/melisa
Merge branch 'master' of github.com:taufiksu/melisa
Merge branch 'master' of github.com:taufiksu/melisa
Merge branch 'master' of github.com:taufiksu/melisa
Merge branch 'master' of github.com:taufiksu/melisa
gak tau

Merge branch 'master' of github.com:taufiksu/melisa

Conflicts:
	application/config/database.php
konflik mulu

Merge branch 'master' of github.com:taufiksu/melisa

Conflicts:
	application/config/database.php
Merge branch 'master' of github.com:taufiksu/melisa
Merge branch 'master' of github.com:taufiksu/melisa
Merge branch 'master' of github.com:taufiksu/melisa
Merge branch 'master' of github.com:taufiksu/melisa
Merge branch 'master' of github.com:taufiksu/melisa
Merge branch 'master' of github.com:taufiksu/melisa
Merge branch 'master' of github.com:taufiksu/melisa
Merge branch 'master' of github.com:taufiksu/melisa