Fixed conflict

Author: micahhausler

.gitignore

@@ -8,3 +8,10 @@ dist
 .tox
 .coverage
 html/*
+
+# Compiled Documentation
+site/
+
+env/
+venv/
+.idea/

MANIFEST.in

@@ -2,4 +2,5 @@ include test-requirements.txt
 include requirements.txt
 include requirements3.txt
 include README.md
-include LICENSE
+include LICENSE
+recursive-include tests *.py

Makefile

@@ -0,0 +1,15 @@
+.PHONY: all build test integration-test unit-test
+
+all: test
+
+build:
+	docker build -t docker-py .
+
+test: unit-test integration-test
+
+unit-test: build
+	docker run docker-py python tests/test.py
+
+integration-test: build
+	docker run -v /var/run/docker.sock:/var/run/docker.sock docker-py python tests/integration_test.py
+