killing bugs, saving people.  y'know, the family business
Merge branch 'master' of git://github.com/dgforck1/Chess-

Conflicts:
	client/chess.cpp~