first commit
Merge git://github.com/Snoken/django_class

Conflicts:
	.gitignore