He metido el programa de jujo
Merge branch 'master' of https://github.com/zerosofadown/aprendizaje-aguilas

Conflicts:
	ConsoleApplication7/bin/Debug/ConsoleApplication7.vshost.exe
	ConsoleApplication7/obj/Debug/ConsoleApplication7.csproj.FileListAbsolute.txt
	ConsoleApplication7/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache