small changes, toolbar back to before
Merge branch 'master' of https://github.com/ofZach/zoomDraw
pan now working