Changes
Merge branch 'master' of https://github.com/dkang81/ocamlclient

Conflicts:
	src/client.ml