Changes to implement transfering a file
Merge branch 'master' of https://github.com/acchaulk/Text-ChatRoullette

Conflicts:
	src/client.c
	src/include/control_msg.h
	src/server.c