Closer to working UI.
Merge branch 'master' of https://github.com/hhubbell/bbb-workshop