Merge branch 'master' into prod

.gitattributes

@@ -0,0 +1,2 @@
+# Never merge settings.py - always use branch version
+settings.py merge=ours

mysite/urls.py

@@ -4,6 +4,7 @@ from .views import Doxme, home, robots
 
 urlpatterns = [
     path('home/', home),
+    path('', home),
     path('robots.txt/', robots),
     path('doxme/', Doxme.as_view()),
 ]