resolving merge conflict by adding both requirements.
[oweals/karmaworld.git] / karmaworld / apps / __init__.py