p
12
12

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

Conflicts:
	.Rhistory
	man/plotWD.Rd
	man/polar.theme.Rd
	shinyapps/mbonoli/WindResource.dcf