adding timer code
Merge branch 'master' of https://github.com/kathrynsiegel/concierge

* 'master' of https://github.com/kathrynsiegel/concierge:
  Add gitattributes.