changes Feb 11
made changes suggested by prof at 5 pm Feb 17
adding holly's stuff
Merge branch 'master' of https://github.com/phdhistorystudent/phdhistorystudent.github.com