asdf
Merge branch 'master' of https://github.com/ptraverse/soapyclustal

Conflicts:
	.project
	helloworld_client/client.php
	helloworld_server/server.php
	spec/helloworld.php