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

Conflicts:
	Escape-the-Dawn/GameWorld.cpp

Escape-the-Dawn/Components/Transform.h

@@ -9,9 +9,13 @@ namespace Components
 
 struct Transform : Component
 {
+	Transform() 
+		: Scale(glm::vec3(1.f)) { }
+
 	glm::vec3 Position;
 	glm::quat Orientation;
 	glm::vec3 Velocity;
+	glm::vec3 Scale;
 };
 
 }