database
Merge branch 'master' of https://github.com/tecshuttle/car

Conflicts:
	application/config/database.php
Merge branch 'master' of https://github.com/tecshuttle/car

Conflicts:
	application/controllers/welcome.php
	application/models/user_model.php
aa