added shader manager
merged shaderProgram
Merge branch 'master' of https://github.com/pedroth/AVT

Conflicts:
	projects/assignment4/src/ShaderManager.cpp
	projects/assignment4/src/ShaderManager.h
	projects/assignment4/src/ShaderProgram.h
tirado erro de merge