modified:   .gitignore
modified:   voting/models.py
Merge branch 'master' of https://github.com/grengojbo/django-voting
modified:   voting/ajax.py