ModelClass
up
Merge branch 'master' of github.com:aeronzhou/MyFirstRenderPipeline

Conflicts:
	Src/ColorShaderClass.cpp
	Src/ColorShaderClass.h
up