change Timer fn prototype to use "this"
Merge pull request #8 from tiger-swallowtails-2013/update_Timer

MERGE ALGO FIRST! Update timer