no hice nada pero 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
Ultimos cambios
Merge branch 'master' of https://github.com/gonzalezf/Tarea2bd

Conflicts:
	databaseforo.txt
	foro2/foro2.v12.suo
	foro2/foro2/Views/Inicio/Index.cshtml
	foro2/foro2/bin/foro2.dll
	foro2/foro2/bin/foro2.pdb
	foro2/foro2/foro2.csproj
	foro2/foro2/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	foro2/foro2/obj/Debug/foro2.dll
	foro2/foro2/obj/Debug/foro2.pdb
	foro2/foro2/tablasforo.cs