Added global_timer
Merge branch 'master' of https://github.com/marcdjulien/ERTSLab3