fixed some stuff and etc.
Merge branch 'master' of github.com:iz4k/Sandcanvas

Conflicts:
	scripts/main.js