Proyectos de .Domain y .Data
xxx
Merge commit '39850c1f921f7e72ea2ef4835f3b42cdd10c0ad3'
d48fbb70e9383badcf1c.

Conflicts:
	NutriFlOw/NutriFlOw.Domain/Prueba/Usuario.cs

Conflicts:
	NutriFlOw/NutriFlOw.sln
Proyecto Wendy, union
Revert "Proyecto Wendy, union"

This reverts commit 1691103f0fcace275aa2aa9d3804d155a42adaeb.
Merge branch 'master' of https://github.com/apaz89/NutriFlOw into CarlosRosales

Conflicts:
	NutriFlOw/NutriFlOw.Tests/bin/Debug/System.Web.Helpers.xml
	NutriFlOw/NutriFlOw.Tests/bin/Debug/System.Web.Razor.xml
	NutriFlOw/NutriFlOw.Tests/bin/Debug/System.Web.WebPages.Deployment.xml
	NutriFlOw/NutriFlOw.Tests/bin/Debug/System.Web.WebPages.Razor.xml
	NutriFlOw/NutriFlOw.Tests/bin/Debug/System.Web.WebPages.xml
	NutriFlOw/NutriFlOw.Tests/obj/Debug/NutriFlOw.Tests.csproj.FileListAbsolute.txt
	NutriFlOw/NutriFlOw/bin/System.Web.Helpers.xml
	NutriFlOw/NutriFlOw/bin/System.Web.Razor.xml
	NutriFlOw/NutriFlOw/bin/System.Web.WebPages.Deployment.xml
	NutriFlOw/NutriFlOw/bin/System.Web.WebPages.Razor.xml
	NutriFlOw/NutriFlOw/bin/System.Web.WebPages.xml
	NutriFlOw/NutriFlOw/obj/Debug/NutriFlOw.Web.csproj.FileListAbsolute.txt