more love
Merge branch 'django' of github.com:jgasteiz/tallerdeasier into django