Different Rhistory file
rhistorybs

Merge branch 'master' of https://github.com/morndorff/GoF-Test

Conflicts:
	.Rhistory
Merge branch 'master' of https://github.com/morndorff/GoF-Test
Who knows