diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..6f2ca46
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,7 @@
+FROM python:alpine
+
+COPY . /shreddit
+WORKDIR /shreddit
+RUN pip install -r requirements.txt && python setup.py install
+
+CMD ["/usr/local/bin/shreddit"]
diff --git a/requirements.txt b/requirements.txt
index 043970d..c5abd98 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,18 +1,6 @@
-<<<<<<< HEAD
-arrow==0.9.0
-decorator==4.0.10
-praw==4.2.0
-PyYAML==3.12
-requests==2.12.1
-six==1.10.0
-backports-abc==0.4
-tornado==4.3
-update-checker==0.15
-wheel==0.24.0
-appdirs==1.4.3
-=======
 appdirs==1.4.3
 arrow==0.10.0
+decorator==4.0.10
 backports-abc==0.5
 certifi==2017.4.17
 chardet==3.0.4
@@ -27,4 +15,4 @@ six==1.10.0
 tornado==4.5.1
 update-checker==0.16
 urllib3==1.21.1
->>>>>>> 772df35c68a6782b2bd733801458023545977166
+wheel==0.24.0
\ No newline at end of file