changes
changes
finalized i think
Merge branch 'master' of https://github.com/Macri-man/OPENGL

Conflicts:
	error.cpp
	initShaders.h
	src/error.cpp