.
Merge branch 'master' of github.com:paternogbc/PowerC

Conflicts:
	sampling.pgls.R