texture generation
Merge branch 'master' of https://github.com/Valian/pgg

Conflicts:
	javascript/pgg.js