Fixed settings.py
merged README