prepare to merge
Merge branch 'master' of https://github.com/wrbrooks/gwr-sim

Conflicts:
	scratch/gaussian.r
fixed simulations.