Adding tests for timer, fixing bug where timer does not reset with player
Merge branch 'master' into 071b__M10_Timer
Adding test for the MULETimer, fixing bug where timer does not update