Merge pull request #2 from PaulPauls/master

merge upstream
 Changes to be committed:
	modified:   ../.gitignore
	deleted:    client
	modified:   performConnection.c
Merge pull request #9 from ciil/master

performWait()