Cambios BB
Merge branch 'master' of https://github.com/mbonoli/WindResource

Conflicts:
	.RData
	.Rhistory
	DESCRIPTION
	R/tableWD.R