Merge branch 'master' of github.com:DjangoGirls/tutorial
Test gitbook integration commit DjangoGirls#1.