Fix some things

4 files changed, 20 insertions, 13 deletions

diff --git a/src/CTController/CTConsole.cpp b/src/Controller/ConsoleController/ConsoleController.cpp
index 44b598e..44b598e 100644
--- a/src/CTController/CTConsole.cpp
+++ b/src/Controller/ConsoleController/ConsoleController.cpp
diff --git a/src/CTController/CTConsole.hpp b/src/Controller/ConsoleController/ConsoleController.hpp
index 9534877..9534877 100644
--- a/src/CTController/CTConsole.hpp
+++ b/src/Controller/ConsoleController/ConsoleController.hpp
diff --git a/src/ViewController/MainController.cpp b/src/View/MainController.cpp
index e69de29..e69de29 100644
--- a/src/ViewController/MainController.cpp
+++ b/src/View/MainController.cpp
diff --git a/src/main.cpp b/src/main.cpp
index 206b47a..91a1fe6 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,22 +1,29 @@
+
+//----- STD include -----
 #include <iostream>
 #include <string>
 #include <time.h>
+//----------------------
 
-<<<<<<< HEAD
+//----- Personnal include -----
 #include "./Model/Grid.hpp"
-=======
-#include "CTController/CTConsole.hpp"
->>>>>>> 71ebf1235ed023425c2539eabf1d15ba922c1dda
+#include "./Controller/ConsoleController/ConsoleController.hpp"
+//-----------------------------
+
+
+//----- Start -----
 
 int main()
 {
-    srand(time(NULL));
-    
-    CTConsole * controller = new CTConsole();
-    
-    controller->play();
-    
-    delete controller;
-    
-    return 0;
+    	//Init random
+	srand(time(NULL));
+
+	//Init console controller
+	ConsoleController * controller = new ConsoleController();
+
+	controller->play();
+
+	delete controller;
+
+	return 0;
 }