Me voy a dormir_3
Merge branch 'master' of https://github.com/team-404-he/ProyectoIBases

Conflicts:
	table.cpp
	table.h
meus deus
...