diff --git a/.gitignore b/.gitignore
index cf0449c..9e94514 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,3 @@
 static/admin/
 static/django_extensions/
 static/rest_framework/
-/static/
diff --git a/nginx.conf b/nginx.conf
index 0e7ea01..3450ba8 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -25,5 +25,13 @@ http {
         proxy_redirect off;
       }
 
+      location /static/ {
+        alias /usr/share/nginx/html/static/;
+      }
+
+      location /media/ {
+        alias /usr/share/nginx/html/media/;
+      }
+
   }
 }