merge
Merge branch 'master' of https://github.com/Madgvox/pixl

Conflicts:
	dev/1.main.js
	dev/1.main.js.map
	dev/main.js.map