Merge branch 'master' of https://github.com/dittos/graphql-py into overlapping-fields-can-be-merged

Author: jhgg

.gitignore

@@ -60,4 +60,7 @@ docs/_build/
 target/
 
 # IntelliJ
-.idea
+.idea
+
+# OS X
+.DS_Store

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "libgraphqlparser"]
+	path = libgraphqlparser
+	url = https://github.com/graphql/libgraphqlparser.git

.travis.yml

@@ -11,7 +11,7 @@ install:
 - pip install pytest>=2.7.3 --upgrade
 - pip install -e .
 script:
-- py.test --cov=graphql
+- py.test --cov=graphql tests
 - flake8
 after_success:
 - coveralls

README.md

@@ -4,6 +4,7 @@ GraphQL implementation for Python
 
 [![Build Status](https://travis-ci.org/dittos/graphqllib.svg?branch=master)](https://travis-ci.org/dittos/graphqllib)
 [![Coverage Status](https://coveralls.io/repos/dittos/graphqllib/badge.svg?branch=master&service=github)](https://coveralls.io/github/dittos/graphqllib?branch=master)
+[![Public Slack Discussion](https://graphql-slack.herokuapp.com/badge.svg)](https://graphql-slack.herokuapp.com/)
 
 
 ## Project Status

graphql/core/execution/__init__.py

@@ -242,7 +242,7 @@ def get_field_entry_key(node):
 class ResolveInfo(object):
     def __init__(self, field_name, field_asts, return_type, parent_type, context):
         self.field_name = field_name
-        self.field_ast = field_asts
+        self.field_asts = field_asts
         self.return_type = return_type
         self.parent_type = parent_type
         self.context = context