comments package
Merge branch 'master' of https://github.com/marcb40/django_examples

Conflicts:
	src/django_examples/settings.py