diff --git a/servicePoints/__pycache__/__init__.cpython-36.pyc b/servicePoints/__pycache__/__init__.cpython-36.pyc
index b890e80cc2b9d8fb67beb2525dc9b78ddd312088..ae8c520b2453458e48760c1786f565c6eb628aac 100644
Binary files a/servicePoints/__pycache__/__init__.cpython-36.pyc and b/servicePoints/__pycache__/__init__.cpython-36.pyc differ
diff --git a/servicePoints/__pycache__/config.cpython-36.pyc b/servicePoints/__pycache__/config.cpython-36.pyc
index b66ba84188a594b21aaafed82eaf48f9bd9e303e..e2f47fdc2b33a9855315f2cf9e0a9c0260d21cf5 100644
Binary files a/servicePoints/__pycache__/config.cpython-36.pyc and b/servicePoints/__pycache__/config.cpython-36.pyc differ
diff --git a/servicePoints/__pycache__/model.cpython-36.pyc b/servicePoints/__pycache__/model.cpython-36.pyc
index 86bb7b3a23476b2371ea8739ac81138b684f2091..987ba06aecd14df951ced9f5575b13c29be1c283 100644
Binary files a/servicePoints/__pycache__/model.cpython-36.pyc and b/servicePoints/__pycache__/model.cpython-36.pyc differ
diff --git a/servicePoints/views/__pycache__/__init__.cpython-36.pyc b/servicePoints/views/__pycache__/__init__.cpython-36.pyc
index 180037e3f49e55ada44d0f5f95254730be1535b7..1d30055a28038c24f70515e1ec1990883944f38d 100644
Binary files a/servicePoints/views/__pycache__/__init__.cpython-36.pyc and b/servicePoints/views/__pycache__/__init__.cpython-36.pyc differ
diff --git a/servicePoints/views/__pycache__/accounts.cpython-36.pyc b/servicePoints/views/__pycache__/accounts.cpython-36.pyc
index 29b95f49454f3040969bbf9ac5eaff5f61fc6be4..87feb1c89c1e6ef633f85ad2d24f87b1e9244dab 100644
Binary files a/servicePoints/views/__pycache__/accounts.cpython-36.pyc and b/servicePoints/views/__pycache__/accounts.cpython-36.pyc differ
diff --git a/servicePoints/views/accounts.py b/servicePoints/views/accounts.py
index 8a3b12a13e8ba10b7da47d303d7689a5b641ead5..7737582590e710482ac65a35dde67bba447eae61 100644
--- a/servicePoints/views/accounts.py
+++ b/servicePoints/views/accounts.py
@@ -156,7 +156,6 @@ def createOrg():
 
 @servicePoints.app.route('/', methods=['GET', 'POST'])
 def index():
-    """Render index page."""
     if 'username' in flask.session:
         username = flask.session["username"]
         cursor = servicePoints.model.get_db()
diff --git a/sql/schema.sql b/sql/schema.sql
index 0e5ffc94d83f3b8047e3492ea6698eb32df4b6ff..fab44f6b328d4742195604282e9b35ec874a1358 100644
--- a/sql/schema.sql
+++ b/sql/schema.sql
@@ -16,14 +16,12 @@ CREATE TABLE orgs(
 	  PRIMARY KEY(orgName)
 );
 
-<<<<<<< HEAD
-
 CREATE TABLE tutors(
 	  username VARCHAR(20) NOT NULL,
 	  subject VARCHAR(40) NOT NULL,
 	  time VARCHAR(80) NOT NULL,
 	  PRIMARY KEY(username)
-=======
+);
 CREATE TABLE requests(
 	  postid INTEGER NOT NULL,
 	  member VARCHAR(20) NOT NULL,
@@ -31,5 +29,4 @@ CREATE TABLE requests(
 	  service VARCHAR(40) NOT NULL,
 	  filename VARCHAR(64) NOT NULL,
 	  PRIMARY KEY(postid)
->>>>>>> a13a88a5b357d5ce4091c99247484845da5be53e
 );
\ No newline at end of file
diff --git a/var/images/c0cf17efda2368530bb66b4e2fb68456865edbbdaa67c99783de324711384437.jpg b/var/images/c0cf17efda2368530bb66b4e2fb68456865edbbdaa67c99783de324711384437.jpg
deleted file mode 100644
index b7f849e6e752e3a8331fe22bb1261a55ce6965e8..0000000000000000000000000000000000000000
Binary files a/var/images/c0cf17efda2368530bb66b4e2fb68456865edbbdaa67c99783de324711384437.jpg and /dev/null differ
diff --git a/var/images/e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 b/var/images/e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/var/servicePoints.sqlite3 b/var/servicePoints.sqlite3
index 6a0e7d9205f2272c6ae9612c83e0fd77dd25e5fe..c261955ae7d3382983d4e92ac248c9fc0e5b48ff 100644
Binary files a/var/servicePoints.sqlite3 and b/var/servicePoints.sqlite3 differ