ultimo
Merge branch 'master' of https://github.com/franzbel/tallerSistemas
ultimo
Merge branch 'master' of https://github.com/franzbel/tallerSistemas

Conflicts:
	db/schema.rb
pedidos mesero ok