repaired celery, c2 error, finish merge

rowers/celery.py

@@ -8,7 +8,7 @@ from celery import Celery
 # on Windows, so I use Celery on my notebook.
 
 # set the default Django settings module for the 'celery' program.
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'rowsandall_app.settings')
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'rowsandall_app.settings_dev')
 
 from django.conf import settings  # noqa
 
@@ -25,6 +25,8 @@ app.config_from_object('django.conf:settings')
 app.autodiscover_tasks(lambda: settings.INSTALLED_APPS)
 
 
+database_url = 'sqlite:///db.sqlite3'
+
 @app.task(bind=True)
 def debug_task(self):
     print('Request: {0!r}'.format(self.request))