sclarson/codecamp-django — pull request #1 by harmstyler (2012-08-21 23:31:35+00:00)
Title: Resolves merge conflict

Resolves merge conflict with requirements.txt and settings.py