Trying to fix some name clashes
pfft!
Merge branch 'master' of https://github.com/namiskuukkel/django-grader

Conflicts:
	grader/grade/models.py
pfft moar
pffft moar