Merge remote-tracking branch 'origin/master'

skolehjem/app/Http/Controllers/CalendarController.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Response;
+
+
+class CalendarController extends Controller
+{
+//    public function index()
+}

skolehjem/app/Http/Controllers/RootController.php

@@ -8,6 +8,6 @@ use Illuminate\Http\Response;
 class RootController extends Controller
 {
     public function index() {
-        return Response::detect("index");
+        return Response::detect("root.index");
     }
 }