django tutorial up to second part (inclusive)
Merge branch 'master' of https://github.com/feliesp/cuchuflito_com