cleaned up overlaps between both of our codes - got rid of timer1 ms counter, rearranged tasks that rely on ms counter update into timer0. Commented out half-made functions that would prevent building