test work in the work
 Changes to be committed:
	new file:   client.php
	new file:   client1.php
	new file:   gb/image.html
	new file:   gb/image_create.php
	new file:   gb/mega.gif
	modified:   index.php
	modified:   index.xml
	new file:   server.php
	new file:   soc/client.php
	new file:   soc/dummy.php
	new file:   soc/get_dummy.php
	new file:   soc/index.php
	new file:   stock.wsdl
	new file:   style.css
 Changes to be committed:
	modified:   gb/image_create.php
	modified:   soc/client.php
Merge branch 'master' of git://github.com/meganosro/test_work

Conflicts:
	gb/image_create.php
	soc/client.php

 Changes to be committed:
	modified:   gb/image_create.php
	modified:   soc/client.php