merge
Merge branch 'master' of github.com:decode/Rpkg

Conflicts:
	ahptropy/ahptropy.combine.R