update log
log update
update log
merge dev
Merge branch 'dev-app'
Merge branch 'dev-app' into master
index.html - markup for controls ui
Merge branch 'dev-app' into master
Merge branch 'master' into dev-app
Merge pull request #4 from bFraley/dev-app

finally merging after resolving local sync issues