u
Merge remote-tracking branch 'origin/master'

Conflicts:
	.Rhistory
cambios

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

Conflicts:
	.Rhistory