edits to biblio
fixed html conflict
Merge branch 'master' of https://github.com/grunwaldlab/Population_Genetics_in_R