test 2
Merge branch 'master' of https://github.com/cmerow/meteR
Merge branch 'master' of https://github.com/cmerow/meteR

Conflicts:
	R/make_mete.R