Merge branch 'master' of https://github.com/szmoore/MCTX3420.git

diff --cc server/Makefile
Simple merge

diff --cc server/fastcgi.c
Simple merge

diff --cc server/fastcgi.h
index bac816a,ec1db25..c4d2ef5
--- 1/server/fastcgi.h
--- 2/server/fastcgi.h
+++ b/server/fastcgi.h
@@@ -29,8 -27,8 +29,9 @@@ extern void FCGI_JSONKey(const char *ke
  extern void FCGI_JSONValue(const char *format, ...);
  extern void FCGI_EndJSON();
  extern void FCGI_RejectJSON(FCGIContext *context);
 +extern void FCGI_RejectJSONEx(FCGIContext *context, StatusCodes status, const char *description);
  extern void * FCGI_RequestLoop (void *data);
+ #define FCGI_PrintRaw FCGI_JSONValue // Functionality is identical
  
  #endif