Merge branch 'master' of https://github.com/eolalde/djangotut
Merge branch 'master' of https://github.com/eolalde/djangotut