Delete local_settings.py
Merge remote-tracking branch 'origin/master'
Merge branch 'develop'
del yoga site
fix reguiriment