updated splatter-client in progress
Merge branch 'master' of github.com:millslr1/db3

Conflicts:
	splatter-client