re-adding settings.py -- dev
fake change for testing merge behavior
fixing merge
one more fake change for testing branch behavior again
Merge branch 'dev'