ready for REVOCS (gcovers)
Merge branch 'master' of https://github.com/jbrackins/CSC470

I have to merge this because i worked on stuff and so did julian at the same time i guess. i think this is the right thing to do, but i'm really never sure.................