chnaged client
Merge branch 'sweta'

Conflicts:
	poke-py/.pydevproject
	poke-py/poke/client/PokeClient.py
Working Client server
Merge branch 'sweta'

Conflicts:
	poke-py/poke/client/PokeClient.py
Client