Shader working

Signed-off-by: ZPaulo <jose.p.s.olive@gmail.com>
Merge branch 'master' of https://github.com/ZPaulo/LAIG

Conflicts:
	Proj-2/Parser.h