commiting changes for merge
Merge branch 'master' of https://github.com/katewindy/refactoru-midterm
Got most of the stats working, starting to implement pie charts