cambiooss
Merge branch 'development' of github.com:iferminm/clase_django_heroku into develoment

Conflicts:
	clase_django/urls.py
	peliculas/views.py
Merge branch 'development' of github.com:iferminm/clase_django_heroku into develoment

Conflicts:
	clase_django/__init__.pyc
	clase_django/settings.pyc
	clase_django/urls.py
	peliculas/views.py
Merge branch 'development' of github.com:iferminm/clase_django_heroku into develoment
cambio
cambioo2