commit for merge
Merge branch 'master' of github.com:encorelab/evoroom4
user_phase now controls time HTML
merge 1
Merge branch 'master' of github.com:encorelab/evoroom4