added timings
Merge branch 'master' of github.com:magnhaug/senior-bootcamp-2014-archetype