resolved conflicts

msg.c

@@ -1,5 +1,6 @@
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
 #include <sys/types.h>
 #include "msg.h"
 
@@ -31,24 +32,35 @@ struct Buffer *new_buffer() {
 	return b;
 }
 
-void append_space(Buffer * b, int bytes) {
-	b->size += bytes;
+void append_space(Buffer * b, int n) {
+	b->size += n;
 	b->data = realloc(b->data, b->size);
 }
 
 void serialize_int(int x, Buffer * b) {
-	// htonl :: uint32_t -> uint32_t
+	// htonl :: uint32_t -> uint32_t -- converts the parameter from host byte order to network byte order
 	x = htonl(x);
 
 	append_space(b, sizeof(int));
 
-	memcpy(((char *)b->data) + b->next, &x, sizeof(int));
-	b->next += sizeof(int);
+	memcpy( ((char*)b->data) + b->size, &x, sizeof(int));
+	b->size += sizeof(int);
+}
+
+void serialize_string(char *str, Buffer *b) {
+	
+	int newlen = strlen(str);
+
+	append_space(b, newlen);
+
+	for (int i=0; i < newlen; ++i) {
+		memcpy( ((char*)b->data) + b->size + i, str[i], sizeof(char));	
+	}
+
+	b->size += newlen;
 
 }
 
-
-//serialize_string
 //serialize_message