Merge pull request #6 from Curlyfries13/master

Fix client table function
Fixed issue with staying in incarnation loop forever.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	server.c