updated poppr and adegenet
Merge branch 'master' of https://github.com/grunwaldlab/Population_Genetics_in_R

Conflicts:
	C2_Getting_ready_to_use_R.html
	C5_Population_Hierarchies.html
	C6_Locus_Stats.html
	C7_Genotypic_EvenRichDiv.html
	C8_Linkage_disequilibrium.html
	C9_Pop_Structure.html
	Preface.html
	TOC.html