urls.py updated
base urls.py updated
revert urls.py changes
Merge remote branch 'upstream/master'
README merged
changes reverted
reverted urls.py
chenges reverted
fix from django.conf.urls.default
Merge pull request #34 from ET-CS/master

Great work again!

I think you should be able to set my repo as a remote and push to that. But it is also good to have a little code review before a merge :)