another merge of new code
Merge branch 'master' of https://github.com/sreepada/CSCI580Project

Conflicts:
	coloringAndShading.js
	constants.js
	render.js