edit
Merge pull request #15 from pure-python/new-feature

edit
Merge remote-tracking branch 'origin/master' into Iulian

Conflicts:
	fb/views.py
	purepython/urls.py