Merge remote-tracking branch 'origin/master'

# Conflicts:
#	ClientApp/main.cpp

ClientApp/main.cpp

@@ -21,6 +21,7 @@
 #include <ReWindow/Logger.h>
 #include <Core/Tile.hpp>
 #include <JGL/logger/logger.h>
+#include <JJX/JSON.hpp>
 
 std::string read_file(const std::string& file_path)
 {
@@ -43,7 +44,7 @@ std::string read_file(const std::string& file_path)
 
 int main(int argc, char** argv) {
 
-
+    using namespace JJX;
     std::string content = read_file("assets/data/tiles/base_tiles.json");
 
     auto [text, parse_error] = json::parse(content);