fixed; now just run ./manage.py runserver
merged