Merged master

frontend/data/service.json

@@ -104,13 +104,6 @@
             "github_url": "https://github.com/cthit/dockerBoi",
             "icon": "ship"
           },
-          {
-            "title": "BussIT",
-            "url": "https://bussit.chalmers.it",
-            "description": "A quick way to know when the buses and trams leave Chalmers.",
-            "github_url": "https://github.com/cthit/BussIT",
-            "icon": "bus"
-          },
           {
             "title": "hexIT",
             "url": "https://hex.chalmers.it",
@@ -124,6 +117,20 @@
             "description": "Create templates for printing pins",
             "github_url": "https://github.com/cthit/pins",
             "icon": "bulb"
+          },
+          {
+            "title": "Vikunja",
+            "url": "https://vikunja.chalmers.it",
+            "description": "A self-hosted service for setting up kanban-boards",
+            "github_url": "",
+            "icon": "kanban"
+          },
+          {
+            "title": "Rallly",
+            "url": "https://rallly.chalmers.it",
+            "description": "Meeting scheduling tool",
+            "github_url": "",
+            "icon": "calendar"
           }
 
         ]
@@ -138,13 +145,6 @@
                 "github_url": "",
                 "icon": "eye"
             },
-            {
-                "title": "IRC tutorial",
-                "url": "https://irc.chalmers.it",
-                "description": "This is where I'd put my IRC... If I had one. =(",
-                "github_url": "",
-                "icon": "comment"
-            },
             {
                 "title": "wikITpedia",
                 "url": "https://wiki.chalmers.it",