Merge branch 'master' into master

4 files changed, 9 insertions, 5 deletions

diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
index 2afb883..4229462 100644
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@@ -51,7 +51,7 @@ class Handler extends ExceptionHandler {
                     return redirect()->to(env('SETTING_INDEX_REDIRECT'));
                 }
                 // Otherwise, show a nice error page
-                return view('errors.404');
+                return response(view('errors.404'), 404);
             }
             if ($e instanceof HttpException) {
                 // Handle HTTP exceptions thrown by public-facing controllers
@@ -60,11 +60,15 @@ class Handler extends ExceptionHandler {
 
                 if ($status_code == 500) {
                     // Render a nice error page for 500s
-                    return view('errors.500');
+                    return response(view('errors.500'), 500);
                 }
                 else {
                     // If not 500, render generic page
-                    return response(view('errors.generic', ['status_code' => $status_code, 'status_message' => $status_message]), $status_code);
+                    return response(
+                        view('errors.generic', [
+                            'status_code' => $status_code,
+                            'status_message' => $status_message
+                        ]), $status_code);
                 }
             }
             if ($e instanceof ApiException) {
diff --git a/docs/logo.png b/docs/logo.png
index c70bc6e..d8ab877 100644
--- a/docs/logo.png
+++ b/docs/logo.png
diff --git a/public/css/about.css b/public/css/about.css
index 669c674..07f1517 100644
--- a/public/css/about.css
+++ b/public/css/about.css
@@ -17,11 +17,11 @@
 }
 
 .logo-img {
-    width: 18em;
+    width: 17em;
 }
 
 .logo-well {
-    width: 19em;
+    width: 20.5em;
 
     -webkit-animation: colorpulse 20s infinite;
     animation: colorpulse 20s infinite;
diff --git a/public/img/logo.png b/public/img/logo.png
index c70bc6e..3bd194d 100644
--- a/public/img/logo.png
+++ b/public/img/logo.png