working on tests with jorge
merging diverged master into mine
Add tests for dashboard
Merge branch 'master' of github.com:glenegbert/dinner-dash
cleaning up tests and files
working with watts
something pulled in
Merge branch 'master' of github.com:glenegbert/dinner-dash