Merge branch 'stefans-branch'
Merge branch 'stefans-branch'
Merge branch 'master' into stefans-branch
vulpe's delete
Merge branch 'stefans-branch'
Merge branch 'master' of https://github.com/pure-python/the-first-ducks

Conflicts:
	fb/templates/index.html
	purepython/urls.py