# WARNING: head commit changed in the meantime

Merge branch 'master' of https://github.com/resto-tesis/resto-tesis

Conflicts:
	dom/src/main/java/dom/mesa/MesaServicio.java
Documentacion
Documentacion Java Doc- paquetes mesa,mozo,objetos de valor,oferta y persona