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

Conflicts:
	Escape-the-Dawn/Escape-the-Dawn.vcxproj.filters
	Escape-the-Dawn/GameWorld.cpp
	Escape-the-Dawn/Renderer.cpp
	Escape-the-Dawn/Systems/RenderSystem.cpp

Escape-the-Dawn/GameWorld.h

@@ -32,12 +32,13 @@ class GameWorld : public World
 public:
 	GameWorld(std::shared_ptr<Renderer> renderer) 
 		: m_Renderer(renderer), World() { }
-	void Initialize() override;
+
+	void Initialize();
 
 	void RegisterSystems() override;
 	void RegisterComponents() override;
 
-	void Update(double dt) override;
+	void Update(double dt) ;
 
 private:
 	std::shared_ptr<Renderer> m_Renderer;