made changes to settings and config.py
Merge branch 'settings'
"mereged with settings"