Merge branch 'master' of https://github.com/DrMothra/sketchbook

Conflicts:
WebContent/sketcher2.html
WebContent/sketcher2.js
Fixed line endings