coba git ignore list db ama engine
Merge branch 'master' of https://github.com/angelamuliawan/dwhproject

Conflicts:
	application/config/database -sample.php
	media/js/core/ab-engine - sample.js