Merge branch 'dev' of github.com:E-Almqvist/eOS into dev

kernel/kernel.c

@@ -1,3 +1,4 @@
+#include "memory.h"
 #include "../drivers/vga.h"
 #include "../lib/str.h"
 #include "../lib/strf.h"

kernel/memory.c

@@ -1 +1,9 @@
 #include "memory.h"
+
+char* malloc(unsigned int size) {
+	return " ";
+}
+
+void mfree(char* p) {
+
+}