Fixed NEWS
Added a the ability to read in genepop files and submitted as 1.1
Updated docs for v1.1
genetic_diversity() did not handle the stratum option and there was no testing for that file
Fixed up Fis and added it to genetic_diversity() for continuity.
Fixed some A() action
Fixed some A() action
multilocus Gst_prime was broken.  I fixed it by summing Ht & Hs across loci and then calculating rather than averaging.
Massive rearrangment so that the top level of the repo is install_github() amenable.
pull to push

Merge branch 'develop' of https://github.com/dyerlab/gstudio into develop

Conflicts:
	NEWS
	gstudio/R/A.R
Fixed NEWS
Added a the ability to read in genepop files and submitted as 1.1
Updated docs for v1.1
genetic_diversity() did not handle the stratum option and there was no testing for that file
Fixed up Fis and added it to genetic_diversity() for continuity.
Fixed some A() action
?
multilocus Gst_prime was broken.  I fixed it by summing Ht & Hs across loci and then calculating rather than averaging.
Massive rearrangment so that the top level of the repo is install_github() amenable.
fixing stuff