socket modifed for data to be used with gui.
Merge branch 'master' of https://github.com/rebeccamurphy/Hackathon-2013

merging.
Merge branch 'master' of https://github.com/rebeccamurphy/Hackathon-2013

Conflicts:
	webserver.php
Merge branch 'master' of https://github.com/rebeccamurphy/Hackathon-2013