changes
Merge branch 'master' of https://github.com/josepilar/BurroLog-V1.0

Conflicts:
	burroLog/public/resources/pedidos.html
	burroLog/public/resources/pedidos.pdf