Aggregate changes
Merge branch 'master' of https://github.com/jlastrachan/6.830finalproject
Fixing aggregate problems
Adding formatting and fonts
Merge branch 'master' of https://github.com/jlastrachan/6.830finalproject