Implemented reading file into char[] and writing to a file from a char[]
Fixed client.cpp conflicts