asd
no me deja pullear
Merge branch 'master' of https://github.com/gonzalezf/Tarea2bd

Conflicts:
	foro2/foro2.v12.suo
	foro2/foro2/bin/foro2.dll
	foro2/foro2/bin/foro2.pdb
	foro2/foro2/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	foro2/foro2/obj/Debug/foro2.csprojResolveAssemblyReference.cache
	foro2/foro2/obj/Debug/foro2.dll
	foro2/foro2/obj/Debug/foro2.pdb
cambios!