Example timer implemented
fixing merge
Merge remote-tracking branch 'githubCookBook/master'
More merging fuck ups (should be ok now)