I dont know what this does
Merge branch 'master' of https://github.com/panickeraj/Project-Chatter

Conflicts:
	Server/ChatterProtocol.java
starting the encryption, sending of btyes from client to server is very
buggy
will have to work on it some more

the readin() fucntion in ChatterServer is no finished and needs to loop
and read in bytes untill the 4 zeros are found, which is the end of the
stream
Merge branch 'master' of https://github.com/panickeraj/Project-Chatter