started working on timer elements
removed conflicts by rebuilding gemfile.lock
Merge branch 'master' into timer