Update
Merge branch 'master' of https://github.com/marcusmichaels/Squiggle

Conflicts:
	app.js
	web-svg/logo-white.svg