Merge client/Client

Conflicts:
	README.md