fixes
Merge branch 'master' of https://github.com/namrop/XbmPwn

Conflicts:
	client.pyc