more work
Merge branch 'master' of github.com:benbeadle/DistributedPasswordCracker

Conflicts:
	client_state_machine.c
	client_state_machine.h
merged