commit 4b7624ea937ffc47e701d400455637e544516a45 Merge: dc6f97b 668ed06 Author: Tom Ritter tom@ritter.vg Date: Fri Jul 1 13:47:47 2016 -0400

Merge branch 'vote-tracking' of /home/tom/git/depictor into vote-tracking

graphs.py | 416 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ write_website.py | 18 ++- 2 files changed, 431 insertions(+), 3 deletions(-)