fixed merge conflict

Author: dwhitney

site/_css/users.less

@@ -1,7 +1,7 @@
 section.whos-using-page {
   padding-bottom: 6em;
   text-align: center;
-  max-width: 800px;
+  max-width: 900px;
 
   .prose {
     max-width: 560px;

site/learn/Learn-Queries.md

@@ -28,7 +28,7 @@ The field `name` returns a `String` type, in this case the name of the main hero
 
 > Oh, one more thing - the query above is *interactive*. That means you can change it as you like and see the new result. Try adding an `appearsIn` field to the `hero` object in the query, and see the new result.
 
-In the previous example, we just asked for a the name of our hero which returned a String, but fields can also refer to Objects. In that case, you can make a *sub-selection* of fields for that object. GraphQL queries can traverse related objects and their fields, letting clients fetch lots of related data in one request, instead of making several roundtrips as one would need in a classic REST architecture.
+In the previous example, we just asked for the name of our hero which returned a String, but fields can also refer to Objects. In that case, you can make a *sub-selection* of fields for that object. GraphQL queries can traverse related objects and their fields, letting clients fetch lots of related data in one request, instead of making several roundtrips as one would need in a classic REST architecture.
 
 ```graphql
 # { "graphiql": true }

site/users/index.html.js

@@ -89,6 +89,11 @@ var logos = [
     img: 'project-september.png',
     link: 'https://www.projectseptember.com/'
   },
+  {
+    name: 'Curio',
+    img: 'curio.png',
+    link: 'https://curio.org'
+  },
   // Adding your logo?
   // Add it to the /users/logos/ directory and then append an entry above this comment.
   //