make publishing config optional

Author: merodiro

README.md

@@ -16,7 +16,10 @@ Via Composer
 ``` bash
 $ composer require merodiro/settings
 ```
+
 publish config through
+Optional: only if you want to edit cache configurations
+
 ```bash
 $ php artisan vendor:publish --provider=Merodiro\Settings\SettingsServiceProvider
 ```
@@ -56,10 +59,18 @@ Settings::flush();
 
 ### Get all settings
 Returns all settings stored in key => value array
+
 ```php
 $settings = Settings::all();
 ```
 
+### Get value from blade template
+
+```php
+<h1>@settings('site-name')</h1>
+<h1>@settings('site-name', 'default name')</h1>
+```
+
 ### Cache all settings
 Caches all settings for the duration that has been set in settings.php config file
 
@@ -73,14 +84,6 @@ php artisan settings:cache
 php artisan settings:clear
 ```
 
-### Get value from blade template
-
-```php
-<h1>@settings('site-name')</h1>
-<h1>@settings('site-name', 'default name')</h1>
-```
-
-
 ## Testing
 
 ``` bash

src/SettingsServiceProvider.php

@@ -18,6 +18,11 @@ public function boot()
             __DIR__.'/config/settings.php' => config_path('settings.php'),
         ], 'config');
 
+        $this->mergeConfigFrom(
+            __DIR__.'/config/settings.php',
+            'settings'
+        );
+
         $this->loadMigrationsFrom(__DIR__ . '/migrations');
 
         if ($this->app->runningInConsole()) {