readd opam-server(copyed)
merge opam-client
Merge branch 'master' of github.com:xdzhou/OPAM-INT

Conflicts:
	README.md