edit
Merge branch 'master' of https://github.com/rheitkamp/microbiomePower

Conflicts:
	.Rhistory
...