Merge branch 'master' of github.com:DjangoGirls/tutorial

MarysiaLowas · MarysiaLowas · commit 1867d6ad3f31 · 2014-07-26T16:41:15.000+02:00
merging wih the master
diff --git a/README.md b/README.md
@@ -30,4 +30,4 @@ OK, [let's start at the beginning...](how_internet_works/README.md)
 
 ## About and contributing
 
-This tutorial is maintained by [DjangoGirls](http://djangogirls.org/). If you find any mistakes or want to update the tutorial please [follow the contributing guidelines](contributing/README.md).
+This tutorial is maintained by [DjangoGirls](http://djangogirls.org/). If you find any mistakes or want to update the tutorial please [follow the contributing guidelines](contributing_and_editing_this_book/README.md).

Original file line number	Diff line number	Diff line change
`@@ -30,4 +30,4 @@ OK, [let's start at the beginning...](how_internet_works/README.md)`
`30`	`30`
`31`	`31`	`## About and contributing`
`32`	`32`
`33`		`-This tutorial is maintained by [DjangoGirls](http://djangogirls.org/). If you find any mistakes or want to update the tutorial please [follow the contributing guidelines](contributing/README.md).`
	`33`	`+This tutorial is maintained by [DjangoGirls](http://djangogirls.org/). If you find any mistakes or want to update the tutorial please [follow the contributing guidelines](contributing_and_editing_this_book/README.md).`