Merge branch 'elleDev'
Timer working with count up functionality.  Modified HTML temporarily to support timer.js
Merge conflicts fixed
Fixing merge conflict
Quick change to index.html
fixed merge conflicts