Merge branch 'master' of https://github.com/mb4/WebGL-ParticleGun

Conflicts:
	TODO
	index.html
	js/Controller.js
	js/ParticleGun.js