Database config
config database triple eee test
Resolved conflict
Merge branch 'master' of github.com:nickdecorte/tracore

Conflicts:
	app/config/database.php