2014 Spring semester
Merge branch 'master' of https://github.com/chmullig/cs3157stats