Fixing an issue with alpha channels on pixels
Merge branch 'master' into chart-integration

Conflicts:
	canvas.js
	index.html
	iterative-generator.js
	original-generator.js
Merged with master. Plotting working on original generator