brush snapping
Merge branch 'master' of https://github.com/douglas-c/vis294DaylightVis

Conflicts:
	app.js