Renamed settings.py to settings.py.example
Merge remote-tracking branch 'origin/master'