Merge branch 'yanivnizry-source' into source

Author: leebyron

site/users/index.html.js

@@ -290,6 +290,7 @@ var logos = [
     link: 'http://eastview.church/'
   },
   {
+<<<<<<< HEAD
     name: 'zlyde',
     img: 'zlyde.png',
     link: 'http://www.zlyde.com/'
@@ -344,6 +345,11 @@ var logos = [
     img: 'taller.png',
     link: 'http://www.taller.net.br/'
   },
+  {
+    name: 'WaitlessQ',
+    img: 'waitlessq.png',
+    link: 'http://waitlessq.com/'
+  },
   // Adding your logo?
   // Add it to the /users/logos/ directory and then append an entry above this comment.
   //