diff functionality implemented
Merge branch 'master' of https://github.com/ohadf/multisurf

Conflicts:
	basic_multisurf_client.py