refactor client
Merge branch 'master' of github.com:ZeroPage/davinci-code

Conflicts:
	src/gui/PlayBoard.java