source annoted
Merge branch 'master' of github.com:hugeen/DrawingApp

Conflicts:
	draw.js