small history commit
Merge branch 'master' of https://github.com/rheitkamp/microbiomePower
Accept sylvia's changes
Conflicts:
	.Rhistory