merge from dev

src/static.c

@@ -14,8 +14,14 @@ terms of the MIT license. A copy of the license can be found in the file
 // it will override all the standard library allocation
 // functions (on Unix's).
 #include "stats.c"
+#include "random.c"
 #include "os.c"
+<<<<<<< HEAD
 //#include "memory.c"
+=======
+#include "arena.c"
+#include "memory.c"
+>>>>>>> dev
 #include "segment.c"
 #include "page.c"
 #include "heap.c"