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

Conflicts:
	client_state_machine.h
finished ana/matt merge
Resolving LSP server TODOs