Added server timeout and client timeout

Along with updating all the output for the client and server, I added in
a timeout function for the server and client if the other is not
responding within a certain amount of time.
Added some changes

Tried to fix the merge
Merge branch 'master' of https://github.com/maclellant/SecureFileTransfer

Conflicts:
	client.cpp