diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..1f9677d
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,13 @@
+FROM python:2.7
+ENV PYTHONBUFFERED 1
+
+RUN mkdir /code
+RUN mkdir /files/static
+RUN mkdir /files/media
+RUN mkdir /files/cache
+RUN mkdir /files/tmp
+
+WORKDIR /code
+ADD requirements.txt /code/
+RUN pip install -r requirements.txt
+ADD . /code/
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..25af2bd
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,11 @@
+db:
+    image: postgres
+web:
+    build: .
+    command: python manage.py runserver 0.0.0.0:8000
+    volumes:
+        - .:/code
+    ports:
+        - "8000:8000"
+    links:
+        - db
diff --git a/dss/settings.py b/dss/settings.py
index a91bf7a..1aed694 100755
--- a/dss/settings.py
+++ b/dss/settings.py
@@ -117,7 +117,6 @@ INSTALLED_APPS = (
     'corsheaders',
     'sorl.thumbnail',
     'spa',
-    'tinymce',
     'gunicorn',
     'spa.signals',
     'core',
@@ -223,4 +222,4 @@ JWT_AUTH = {
     'JWT_EXPIRATION_DELTA': timedelta(seconds=900),
     'JWT_ALLOW_REFRESH': True,
     'JWT_REFRESH_EXPIRATION_DELTA': timedelta(days=30),
-}
\ No newline at end of file
+}
diff --git a/requirements.txt b/requirements.txt
index c8d12d2..83dc88d 100755
--- a/requirements.txt
+++ b/requirements.txt
@@ -26,7 +26,6 @@ git+git://github.com/tschellenbach/Django-facebook.git#django-facebook
 git+git://github.com/llazzaro/django-scheduler.git#django-scheduler
 git+git://github.com/omab/python-social-auth.git#egg=python-social-auth
 django-allauth
-django-tinymce
 apache-libcloud
 mandrill
 djrill
@@ -43,4 +42,4 @@ mutagen
 django-enumfield
 
 ipython
-ipdb
\ No newline at end of file
+ipdb