commit to merge
Merge branch 'master' of github.com:alklein/MSCS_Thesis
Merge branch 'master' of github.com:alklein/MSCS_Thesis
implemented Jhat (unbiased err)