jiji
Merge branch 'master' of https://github.com/gonzalezf/Tarea2bd

Conflicts:
	foro2/foro2.v12.suo
frf