Merge branch 'master' of https://github.com/HackspaceJena/space_status

status.json

@@ -91,6 +91,7 @@
             "text": "Today is a good day to DIY! Krautspace is open."
         },
         {
+<<<<<<< HEAD
             "text": "Want to learn to hack hardware? Come to Krautspace now and start by taking things apart."
         },
         {
@@ -104,6 +105,12 @@
         },
         {
             "text": "Come on over and have some fun! The space is open"
+=======
+            "text": "The more you know! Krautspace is open. http://i3.kym-cdn.com/photos/images/newsfeed/000/620/434/f9e.gif"
+        },
+        {
+            "text": "Come to the Krautspace now, we have Mate!"
+>>>>>>> 05377e99a30bbae7ab6dcc1a1c6dcec46cfc5c01
         }
     ],
     "uncertain_text": [
@@ -111,4 +118,4 @@
             "text": "people in #krautspace want their privacy"
         }
     ]
-}
+}