bf 456
bf 456
Merge branch 'bugfix' of https://github.com/haloz/webgl-scratch into bugfix

Conflicts:
	README.md
bf 456
Merge branch 'bugfix' of https://github.com/haloz/webgl-scratch into bugfix
Merge branch 'release' into bugfix