added button and on/off
Merge branch 'master' of github.com:tjsavage/canvas-client