dao
Merge branch 'master' of https://skrater@github.com/skrater/pizzaria.git

Conflicts:
	pizzaria/bin/edu/pizzaria/bean/Pedido.class