Merge branch 'master' of github.com:genenetwork/genenetwork2 into development

Conflicts:
	.gitignore

1 files changed, 8 insertions, 0 deletions

diff --git a/setup.py b/setup.py
new file mode 100755
index 00000000..1b11acc0
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,8 @@
+from setuptools import setup, find_packages
+
+setup(name='genenetwork2',
+      version='2.0',
+      include_package_data=True,
+      # packages=find_packages()
+      packages=['wqflask']
+      )