resolved conflicts

1 files changed, 3 insertions, 3 deletions

diff --git a/run_server.py b/run_server.py
index 5cff199..8e15896 100644
--- a/run_server.py
+++ b/run_server.py
@@ -1,10 +1,10 @@
 #!/usr/bin/python2
-"""used to run the webserver"""
+"""script used to run the webserver"""
 import sys
-sys.path.append("./lib")
+sys.path.append("./photoblaster")
 from server import Server
+
 server = Server()
 
 if __name__ == "__main__":
     server.run_wsgi()
-