first rango
Merge branch 'master' of https://github.com/santiagocasas/my-first-django

merge 1 from github