fix half of bug
Merge branch 'master' of https://github.com/Streamstormer/webGL-project

Conflicts:
	js/webgl.js