finished 2/6
merged jordan's stuff
Merge branch 'master' of https://github.com/timsf/stats-gse