Change some things about views.py (nothing important)
Merge branch 'master' of github.com:albaa/practica