pre-pull
pre-pull
Merge branch 'master' of https://github.com/nikitose/pixel-paint-js

Conflicts:
	index.html
Merge branch 'master' of https://github.com/nikitose/pixel-paint-js
script in a separate file, several minor fixes