removed the Rhistory file
Merge branch 'master' of https://github.com/jzwolski/Storyyy

Conflicts:
	.Rhistory