d
Merge branch 'master' of github.com:andrezinho/md

Conflicts:
	producto.php