Merge remote-tracking branch 'origin/test'
[oweals/karmaworld.git] / karmaworld / settings / __init__.py