Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn

Conflicts:
	Escape-the-Dawn/Renderer.cpp
	Escape-the-Dawn/Systems/PlayerSystem.cpp

Escape-the-Dawn/Shaders/AABB.frag.glsl

@@ -1,5 +1,7 @@
 #version 430
 
+uniform vec4 Color;
+
 in VertexData {
 	vec3 Position;
 	vec3 Normal;
@@ -11,5 +13,5 @@ out vec4 FragmentColor;
 
 void main() {
 	//FragmentColor = vec4(1.0 - gl_Color.r, 1.0 - gl_Color.g, 1.0 - gl_Color.b, 0.0);
-	FragmentColor = vec4(1.0, 1.0, 1.0, 1.0);
+	FragmentColor = Color;
 }