No se lo que va a pasar
Merge branch 'master' of https://github.com/pantostado/Manteca

Conflicts:
	Film/WebApplication1/App_Data/Database1.mdf
	Film/WebApplication1/App_Data/Database1_log.LDF
Merge branch 'master' of https://github.com/pantostado/Manteca

Conflicts:
	Film/WebApplication1/App_Data/Database1.mdf
	Film/WebApplication1/App_Data/Database1_log.LDF