Resolved merge conflict

.gitignore

@@ -2,3 +2,4 @@ __pycache__/
 test.db
 *.pyc
 *.swp
+config.py

config.py

-SQLALCHEMY_DATABASE_URI = "sqlite:///test.db"
-SECRET_KEY = "iesoogh9jangoocheihoig5iejeenixaingah7NuashahSeechaerohg6ouw9moojei8ahmooPaes1ie"
-DEBUG = True