fixed merge conflict

1 files changed, 15 insertions, 0 deletions

diff --git a/mwe/gameloop/src/main.cpp b/mwe/gameloop/src/main.cpp
new file mode 100644
index 0000000..9f407c4
--- /dev/null
+++ b/mwe/gameloop/src/main.cpp
@@ -0,0 +1,15 @@
+//Using SDL and standard IO
+#include <SDL2/SDL.h>
+#include <stdio.h>
+//#include "window.h"
+#include "loopManager.h"
+#include "timer.h"
+
+
+int main(int argc, char * args[]) {
+	LoopManager gameLoop;
+	gameLoop.setup();
+	gameLoop.loop();
+
+	return 0;
+}