Merge branch 'master' of https://github.com/pantostado/Eduardo

Conflicts:
	Film/WebApplication1/Default.aspx
Revert "Merge branch 'master' of https://github.com/pantostado/Eduardo"

This reverts commit e35179cb10873f279a413cf8d376e688239895e6.
Back

Volviendo, conflicto
Merge branch 'master' of https://github.com/pantostado/Eduardo