merge: fixed merge conflic...

.gitignore

@@ -11,4 +11,4 @@
 /imgui.ini
 
 PlayerTracker
-compile_commands.json
+*.json

source/main.cpp

@@ -51,8 +51,8 @@ int main(int argc, char *argv[]) {
 		// Connect socket to API
 		// sock.connect_unix(app.app_api_socket_path.c_str(), app.app_port_out);
 		// Connect socket to Server
-		sock.connect_server(app.app_server_out_ip.c_str(), app.app_port_out);
-		sock.bind_server("127.0.0.1", app.app_port_in);
+		sock.connect_server(app.app_server_out_ip.c_str(), app.app_port_in);
+		sock.bind_server("127.0.0.1", app.app_port_out);
 
 		// Await server for initial data
 		sock.receive_server(buffer, sizeof(buffer));
@@ -106,8 +106,8 @@ int main(int argc, char *argv[]) {
 			}
                 
                 // TODO: 
-			case ACSP_CAR_UPDATE: {
-                log_info("Received car update.\n"); 
+			case ACSP_CAR_UPDATE: {                   
+                // log_info("Received car update.\n");
 				break;
 			}