Refactored some of the Shader stuff into files
Merge remote-tracking branch 'origin/Ex2--Shaders' into Ex2--Shaders
Merge remote-tracking branch 'origin/Ex2--Shaders' into Ex2--Shaders

Conflicts:
	src/main.cpp