committing new requirements before branching
might have fixed django-setting error I was having, server now runs without error