Edit database config file
Merge branch 'master' of https://github.com/lasseal/laravel-test

Conflicts:
	app/config/database.php