fire shader 2

fire shader
Merge branch 'master' of https://github.com/ahc234/Graphics
shader2
Merge branch 'master' of https://github.com/ahc234/Graphics
Merge branch 'master' of https://github.com/ahc234/Graphics

Conflicts:
	shaders2_student/bin/cs4620/material/FireMaterial.class