From 1290749bceca03513bb6ca849b0c8d904a67bf3f Mon Sep 17 00:00:00 2001
From: Torsten <torsten@villataika.fi>
Date: Wed, 20 Sep 2023 03:52:54 +0300
Subject: [PATCH] adds link to living at feenix

---
 app/views/layouts/_footer.haml | 3 +++
 merged/cards.yml               | 2 +-
 merged/sections.yml            | 8 ++++----
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/views/layouts/_footer.haml b/app/views/layouts/_footer.haml
index 70bdd55..6b08e81 100644
--- a/app/views/layouts/_footer.haml
+++ b/app/views/layouts/_footer.haml
@@ -38,6 +38,9 @@
               %li.border-white.border-x.py-2.px-4.hover:bg-gray-50.hover:border-gray-700
                 %a.text-gray-700.transition.hover:opacity-75{:href => "/code_of_conduct"}
                   Code of Conduct
+              %li.border-white.border-x.py-2.px-4.hover:bg-gray-50.hover:border-gray-700
+                %a.text-gray-700.transition.hover:opacity-75{:href => "/hub_living"}
+                  Living at the Hub
               %li.border-white.border-x.py-2.px-4.hover:bg-gray-50.hover:border-gray-700
                 %a.text-gray-700.transition.hover:opacity-75{:href => "/suomeksi"}
                   Lyhyesti suomeksi
diff --git a/merged/cards.yml b/merged/cards.yml
index 902a8a7..74a35dc 100644
--- a/merged/cards.yml
+++ b/merged/cards.yml
@@ -1419,7 +1419,7 @@
   :index: 2
   :header: Cook
   :text: "With the groups getting bigger, so does the need for food.\r\nWhile we have
-    a good team and good recipes, the load is currently spread out. what we are looking
+    a good team and good recipes, the load is currently spread out. What we are looking
     for is someone to take main responsibility for the food, from buying, cooking,
     recipe development and scheduling.  "
   :options:
diff --git a/merged/sections.yml b/merged/sections.yml
index 7340c26..90b6f4b 100644
--- a/merged/sections.yml
+++ b/merged/sections.yml
@@ -1750,7 +1750,7 @@
   :header: Studio for one
   :text: "We have several studio apartments for rent that are about 28m2.\r\nThese
     include a toilet with shower and  have a mini-kitchen in the main space.\r\nThe
-    rent is 350 per month plus electricity. "
+    rent is 360 per month plus heating and electricity. "
 - :template: section_large_image
   :index: 3
   :page_id: 19
@@ -1758,7 +1758,7 @@
   :text: "We have a couple of larger studio apartments, about 50m2 that are suitable
     for a couple. They have their own toilet and shower and a small kitchen in the
     entrance enclave. The main living/sleeping space is about 34m2.\r\nThe rent is
-    550e/month which includes water but excludes electricity."
+    550e/month which includes water but excludes heating and electricity."
   :options:
     margin: large
     order: right
@@ -1795,9 +1795,9 @@
   :page_id: 19
   :header: Community living
   :text: "We currently still have space in an existing larger community space.\r\nThe
-    total space has 8 bedrooms and there is stil a single (about 20m2) and a double
+    total space has 8 bedrooms and there is still a single (about 20m2) and a double
     (about 34m2) free.\r\nRent without electricity is 330 and 480 respectively.\r\nThe
-    kitchen is shared, very large and light. There is also plenty of corridor and
+    shared kitchen is very large and light. There is also plenty of corridor and
     storage space."
   :options:
     margin: large