Added timer
Merge branch 'master' of github.com:saglam/cse507