Implemented timer
Merge pull request #42 from tassiahmed/working

Implemented timer