Timer working with count up functionality.  Modified HTML temporarily to support timer.js
Fixing merge conflict