crap
Merge remote-tracking branch 'origin/master'

Conflicts:
	.Rhistory
	.gitignore
Merge branch 'master' of https://github.com/emittman/heterosis-simulation-study

Conflicts:
	.Rhistory