Pushed working blending
Merge branch 'master' of https://github.com/ksimons221/CS-280-FinalProject

Conflicts:
	texture/textureMapper.m