Removed accidental changes meant for TwoTimers
Implemented two timer method and fixed several bugs. Working sans ADC
wow I'm a mornon
merged over stuff that should have been here anyway
finally merged right
Recovered from the disastrous merge