Clean up stuff.  Commit so I can merge.
Resolved conflicts.

Merge branch 'master' of https://github.com/eriqande/inbredPermute

Conflicts:
	README.Rmd