Merge branch 'master' of https://github.com/GlimmerLabs/MathOverImages

Conflicts:
Sandbox/BasicDraftWorkspace.html
trying to sync with master
attempting to rejoin master